Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -re88830091139dd447cdd6a7f30c129c777104dac -r46690f9897a1d36d9ed0314876d309948ed0adea
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e88830091139dd447cdd6a7f30c129c777104dac)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 46690f9897a1d36d9ed0314876d309948ed0adea)
@@ -459,8 +459,6 @@
 config.header.password.policy = Password policy
 config.password.numerics = Must contain at least a number
 config.password.symbols = Must contain at least one symbol(s)
-config.password.expiration = Password expiration in months (0 = never)
-config.password.history = Do not allow this many last passwords (0 = off)
 error.password.mismatch = Your passwords do not match.
 error.password.empty = Password cannot be empty.
 admin.user.change.password = Force password change
@@ -473,8 +471,6 @@
 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
 sysadmin.batch.preview.lesson.delete = Delete old preview lessons
 msg.cleanup.preview.lesson.confirm = Are you sure you want to delete all preview lessons?
 msg.cleanup.preview.lesson.error = Error while deleting preview lessons
@@ -665,3 +661,7 @@
 config.etherpad.api.key = API Key
 config.etherpad.instance.id = Instance ID
 sysadmin.user.id.name = Parameter to use as loginId:
+config.password.expiration = Password expiration in months (0 = never)
+config.password.history = Prohibit password reuse for a minimum number of generations  (0 = off)
+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
Index: lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -raa932dd995a61adeed918456c6257a4a9a9cea74 -r46690f9897a1d36d9ed0314876d309948ed0adea
--- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision aa932dd995a61adeed918456c6257a4a9a9cea74)
+++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 46690f9897a1d36d9ed0314876d309948ed0adea)
@@ -661,3 +661,7 @@
 config.etherpad.api.key = API Key
 config.etherpad.instance.id = Instance ID
 sysadmin.user.id.name = Parameter to use as loginId:
+config.password.expiration = Password expiration in months (0 = never)
+config.password.history = Prohibit password reuse for a minimum number of generations  (0 = off)
+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
Index: lams_admin/conf/language/lams/ApplicationResources_es_ES.properties
===================================================================
diff -u -r6316ff7fc5ef4c6d3d8bc2d80f283b29d10f17ec -r46690f9897a1d36d9ed0314876d309948ed0adea
--- lams_admin/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision 6316ff7fc5ef4c6d3d8bc2d80f283b29d10f17ec)
+++ lams_admin/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision 46690f9897a1d36d9ed0314876d309948ed0adea)
@@ -661,3 +661,7 @@
 config.etherpad.api.key = Clave API
 config.etherpad.instance.id = ID de instancia
 sysadmin.user.id.name = Parámetro para usar como loginId:
+config.password.expiration = Caducidad de la contraseña después de número de meses (0 = nunca)
+config.password.history = Prohibir la reutilización de contraseñas por un número mínimo de generaciones (0 = desactivado)
+label.password.user.details = no debe coincidir con el nombre de usuario, el correo electrónico o el nombre.
+label.password.common = no debe ser de uso común o previamente violada
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
Index: lams_central/conf/language/lams/ApplicationResources_el_GR.properties
===================================================================
diff -u -rde7760c4ab6ae0196c9955d07e0ca53679b78471 -r46690f9897a1d36d9ed0314876d309948ed0adea
--- lams_central/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision de7760c4ab6ae0196c9955d07e0ca53679b78471)
+++ lams_central/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision 46690f9897a1d36d9ed0314876d309948ed0adea)
@@ -302,7 +302,7 @@
 label.tab.advanced.details = Λεπτομέρειες
 label.tab.advanced.intro.enable = Ενεργοποίηση εισαγωγής μαθήματος
 label.tab.advanced.intro.description = Περιγραφή:
-label.tab.advanced.intro.image = Προβολή σχεδίσων εικόνας
+label.tab.advanced.intro.image = Προβολή σχεδίων εικόνας
 label.tab.advanced.section.advanced = Επιλογές για προχωρημένους
 label.tab.advanced.field.monitor = Έναρξη από Εποπτεία Μαθήματος
 label.tab.advanced.field.liveedit = Ενεργοποίηση Ζωντανής Επεξεργασίας
@@ -932,7 +932,7 @@
 label.qb.stats.option.correct = Σωστή;
 label.qb.stats.option.average = Μέση επιλογή(ως πρώτη επιλογή)
 label.qb.stats.chart = Μέσο γράφημα επιλογών
-label.qb.stats.burning.questions = Καίριες ερωτήσεις
+label.qb.stats.burning.questions = ¨Καυτές" ερωτήσεις
 label.qb.stats.burning.questions.none = Αυτή η ερώτηση δεν έχει καίριες ερωτήσεις
 label.qb.stats.burning.questions.likes = Μου αρέσει
 label.qb.stats.usage = Χρήση σε ενεργά μαθήματα
Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -rde7760c4ab6ae0196c9955d07e0ca53679b78471 -r46690f9897a1d36d9ed0314876d309948ed0adea
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision de7760c4ab6ae0196c9955d07e0ca53679b78471)
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 46690f9897a1d36d9ed0314876d309948ed0adea)
@@ -1094,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
Index: lams_central/conf/language/lams/ApplicationResources_es_ES.properties
===================================================================
diff -u -rde7760c4ab6ae0196c9955d07e0ca53679b78471 -r46690f9897a1d36d9ed0314876d309948ed0adea
--- lams_central/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision de7760c4ab6ae0196c9955d07e0ca53679b78471)
+++ lams_central/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision 46690f9897a1d36d9ed0314876d309948ed0adea)
@@ -1094,3 +1094,10 @@
 authoring.label.application.exercise.doku.gallery.walk.instructions =  Instrucciones para el Paseo por la Galería (por ejemplo: Por favor, revise el trabajo de otros grupos y asegúrese de añadir su revisión/comentario)
 authoring.create.doku.question = Agregar pregunta de documento colaborativo
 authoring.label.application.exercise.doku.gallery.walk.read.only = Deshabilitar comentarios y calificaciones
+authoring.tbl.mark.hedging = ¿Distribución de puntaje (hedging)?
+authoring.tbl.mark.hedging.tooltip = Permite a los estudiantes asignar puntaje a las distintas respuestas según la confianza que tengan en cada una de las mismas. Funciona mejor cuando el puntaje de la pregunta es igual o superior al número de respuestas disponibles.
+error.password.history = Ya usaste esta contraseña anteriormente.
+label.password.expired = Su contraseña ha caducado.
+label.password.user.details = no debe coincidir con el nombre de usuario, el correo electrónico o el nombre.
+label.password.common = no debe ser de uso común o previamente violada
+label.password.history = no debe ser igual a las últimas {0} contraseñas
Index: lams_central/conf/language/lams/ApplicationResources_no_NO.properties
===================================================================
diff -u -rde7760c4ab6ae0196c9955d07e0ca53679b78471 -r46690f9897a1d36d9ed0314876d309948ed0adea
--- lams_central/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision de7760c4ab6ae0196c9955d07e0ca53679b78471)
+++ lams_central/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision 46690f9897a1d36d9ed0314876d309948ed0adea)
@@ -1081,6 +1081,9 @@
 authoring.fla.range.condition.add.start.greater.than.end.error = Startverdien må være mindre eller lik sluttverdien
 signup.email.verify.success = E-postadressen din er bekreftet. Nå kan du logge på.
 signup.email.verify.fail = Det oppsto et problem med å bekrefte e-posten din. Kontakt systemadministratoren.
+authoring.fla.page.ld.description.placeholder = Beskriv denne læringsdesignen og / eller leveringsinstruksjonene for andre lærere. Disse instruksjonene vil bare være tilgjengelige for lærere i leksjonen.
+label.qb.advanced.search = Avansert søk
 authoring.label.application.exercise.doku.gallery.walk.read.only.tooltip = Studentene vil hverken kunne kommentere eller vurdere andre  gruppers arbeid
 authoring.label.application.exercise.doku.description = Beskrivelse
+authoring.label.application.exercise.doku.description.tooltip = Beskrivelse eller case som skal presebnteres for studentene
 authoring.label.application.exercise.doku.gallery.walk.read.only = Fjern kommentarer og virdering
Index: lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties
===================================================================
diff -u -raa932dd995a61adeed918456c6257a4a9a9cea74 -r46690f9897a1d36d9ed0314876d309948ed0adea
--- lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision aa932dd995a61adeed918456c6257a4a9a9cea74)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision 46690f9897a1d36d9ed0314876d309948ed0adea)
@@ -307,7 +307,7 @@
 message.monitoring.edit.activity.warning = Προειδοποίηση: εάν επεξεργαστείτε και τροποποιήσετε μια ερώτηση ή αλλάξετε μια απάντηση για την οποία έχει ήδη απαντήσει ένας εκπαιδευόμενος, τότε ο βαθμός που έλαβε για την τροποποιημένη ερώτηση θα διαγραφεί καθώς θεωρείται ότι η ερώτηση έχει αλλάξει. Αν η επιλογή για επανάληψη είναι διαθέσιμη, τότε ο εκπαιδευόμενος μπορεί να υποβάλει ξανά μια απάντηση για αυτή την ερώτηση.
 label.enable.confidence.levels = Ενεργοποίηση επίπεδου εμπιστοσύνης
 label.what.is.your.confidence.level = Πόσο σίγουροι είστε για την απάντησή σας;
-label.confidence = Επιμοστοσύνη
+label.confidence = Εμπιστοσύνη
 label.no.question.references = Δεν έχουν προστεθεί ερωτήσεις στη λίστα ερωτήσεων. Θέλετε να προχωρήσετε χωρίς ερωτήσεις;
 label.hide.name.column = Απόκρυψη ονόματος στήλης
 label.ira.questions.marks = Ερωτήσεις & Βαθμοί iRAT
Index: lams_tool_doku/conf/language/lams/ApplicationResources_no_NO.properties
===================================================================
diff -u -r2db54768ed82bc5868fa55c0bfb46445fdb06770 -r46690f9897a1d36d9ed0314876d309948ed0adea
--- lams_tool_doku/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision 2db54768ed82bc5868fa55c0bfb46445fdb06770)
+++ lams_tool_doku/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision 46690f9897a1d36d9ed0314876d309948ed0adea)
@@ -140,4 +140,6 @@
 label.monitoring.summary.time.limit.relative.desc = Angi varigheten i minutter som studentene vil ha tilgjengelig for å fullføre vurderingen. Varigheten vil gjelde fra det øyeblikket hver student begynner vurderingen. Hvis de for eksempel er satt til 5 minutter, vil alle studenter ha 5 minutter fra det øyeblikket hver av dem starter vurderingen.
 label.monitoring.summary.time.limit.relative = Varighet i forhold til start  student
 label.monitoring.summary.time.limit = Tidsrammer
+label.time.limit.tooltip = Antall minutter hver student får fra det øyeblikket de deltar i denne aktiviteten. La den stå på 0 dersom det ikke skal være tidsbegrensninger.
 label.monitoring.learner.marks.name = Navn
+label.show.chat.tooltip = Aktiverer chatfunksjonen slik at studentene kan utveksle meldinger mens de jobber med dokumentet samtidig.
Index: lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties
===================================================================
diff -u -rd1086e12b3afabb5388fdad8075e6d28d21170b5 -r46690f9897a1d36d9ed0314876d309948ed0adea
--- lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision d1086e12b3afabb5388fdad8075e6d28d21170b5)
+++ lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision 46690f9897a1d36d9ed0314876d309948ed0adea)
@@ -174,9 +174,9 @@
 label.authoring.export.qti = Εξαγωγή IMS QTI
 label.scratchie.options = Επιλογές ερώτησης
 label.activity.completion = Τέλος, δραστηριότητας
-label.authoring.advanced.burning.questions = Επιλογή σημαντικών ερωτήσεων
-label.burning.questions = 'κάψιμο' ερωτήσεων
-label.burning.question = Σημαντική ερώτηση;
+label.authoring.advanced.burning.questions = Ενεργόποιηση "καυτών¨ερωτήσεων
+label.burning.questions = 'Έλεγχος' ερωτήσεων
+label.burning.question = "Καυτή" Έρώτηση;
 label.time.limit = Προθεσμία (σε λεπτά)
 label.countdown.time.left = Υπολειπόμενος χρόνος
 label.time.is.over = Ο χρόνος τελείωσε. Επεξεργασία απαντήσεως σας ...