Index: lams_common/conf/language/lams/ApplicationResources_no_NO.properties
===================================================================
diff -u -r9606e391610a97bac6305e0e9c42e574f01bd84f -r89dbb4c7674a42c899380cb437d69399efce7b9c
--- lams_common/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision 9606e391610a97bac6305e0e9c42e574f01bd84f)
+++ lams_common/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision 89dbb4c7674a42c899380cb437d69399efce7b9c)
@@ -56,7 +56,7 @@
 email.notifications.lesson = leksjon
 email.notifications.tool = verktøy
 email.notifications.activity = aktivitet
-error.requires.existing.grouping = Aktiviteten {0}krever en registrert gruppe, men det er ikke definert noen gruppe for bruker {1} enda.
+error.requires.existing.grouping = I denne aktiviteten skal du arbeide i en gruppe. Vennligst gå til grupperingsaktiviteten først.
 validation.error.GroupingNotUsed = Gruppering benyttes ikke for noen av aktivitetene
 audit.change.mark = Endret karakter for bruker {0}. Eldre karakter: {1}, ny karakter: {2}
 audit.started.editing.activity = Instruktør {0} har begynt editeringsaktivitet {1} i kontrollmodus
Index: lams_learning/conf/language/lams/ApplicationResources_no_NO.properties
===================================================================
diff -u -rc10d375785107abfec5ed544fa6eaa987836c01a -r89dbb4c7674a42c899380cb437d69399efce7b9c
--- lams_learning/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision c10d375785107abfec5ed544fa6eaa987836c01a)
+++ lams_learning/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision 89dbb4c7674a42c899380cb437d69399efce7b9c)
@@ -2,7 +2,7 @@
 error.title = En feil har oppstått
 message.activity.loading = Den neste oppgaven lastes opp. Vennligst vent...
 message.lesson.finished = Gratulerer,{0}, du er ferdig.
-message.lesson.finishedCont = Du har nå ferdigstilt {0} leksjoner. Du kan vende tilbake til denne for å se på aktivitetene ved å dobbeltklikke på de blå ikoner på venstre side av fremdrifts statusinjen. Du kan nå lukke dette vinduet.
+message.lesson.finishedCont = Du har nå ferdigstilt {0} leksjonen. Du kan vende tilbake til denne for å se på aktivitetene ved å dobbeltklikke på de blå ikoner på venstre side av fremdrifts statusinjen.
 label.next.button = Neste
 label.finish.button = Neste aktivitet
 message.activity.parallel.partialComplete = Du må ferdigstille den andre oppgaven før du går vidre til den neste aktiviteten...
Index: lams_monitoring/conf/language/lams/ApplicationResources_no_NO.properties
===================================================================
diff -u -rc10d375785107abfec5ed544fa6eaa987836c01a -r89dbb4c7674a42c899380cb437d69399efce7b9c
--- lams_monitoring/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision c10d375785107abfec5ed544fa6eaa987836c01a)
+++ lams_monitoring/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision 89dbb4c7674a42c899380cb437d69399efce7b9c)
@@ -237,16 +237,16 @@
 tab.lesson = Leksjon
 tab.sequence = Sekvens
 tab.learners = Studenter
-force.complete.click = Klikk på en aktivitet for å tvinge studenten "[0]" til å slutte  eller utenfor aktiviteten for å avbryte.
-force.complete.end.lesson.confirm = Er du sikker på at du ønsker å tvungen avsluttning for studenten "[0]" på slutten av leksjonen ?
-force.complete.activity.confirm = Er du sikker på at du ønsker å tvungen avsluttning for studenten "[0]" i aktiviteten "[1]" ?
-force.complete.drop.fail = Du har trukket studenten "[0]" over til enten den aktive eller ferdigstillte aktivitet "[1]"
+force.complete.click = Klikk på en aktivitet for å flytte studenter "[0]" eller klikk utenfor aktiviteten for å avbryte.
+force.complete.end.lesson.confirm = Er du sikker på at du ønsker å flytte studentene "[0]" på slutten av leksjonen ?
+force.complete.activity.confirm = Er du sikker på at du ønsker å flytte studentene "[0]" til aktiviteten "[1]" ? Vær klar over at dette tar flere sekunder.
+force.complete.drop.fail = Du har trukket studentene "[0]" over til enten den aktive eller ferdigstillte aktivitet "[1]"
 force.complete.end.lesson.tooltip = For å tvinge en student til å avslutte på slutten av denne leksjonen så trekk studentikonet over til denne siden.
 learner.group.count = Totalt antall studenter
 learner.group.show = Dobbeltklikk for å se den komplette listen.
 learner.finished.dialog.title = Slutt av leksjon
 learner.group.sort.button = Sorter
-button.force.complete = Flytt studenten til.....
+button.force.complete = Flytt de valgte studenten til.....
 button.view.learner = Se på student
 button.close = Lukk
 button.help = Hjelp
@@ -302,7 +302,7 @@
 tour.tab.selection.title = Tab valg
 tour.tab.selection.content.1 = Kontroll er delt inn i tre områder, disse åpnes gjennom titlene øverst på siden.
 tour.tab.selection.content.2 = Leksjon gir deg mer informasjon om leksjonen
-tour.tab.selection.content.3 = Sekvenser gir en oversikt over leksjonens sekvenser og benyttes til å få tilgang til aktiviteter innenfor leksjonen
+tour.tab.selection.content.3 = Sekvenser gir en oversikt over leksjonens sekvenser og benyttes til å få tilgang til aktivitetene
 tour.tab.selection.content.4 = Studenter viser mer informasjon om studentene
 tour.tab.refresh.content = Oppdaterer skjermen.
 tour.lesson.state.content.1 = Klikk på gjeldende status for å endre statusen. Leksjonen kan startes, avsluttes, arkiveres eller fjernes.
Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r7092a47829c41c605c5689ad7f3cd3ed71cb4a53 -r89dbb4c7674a42c899380cb437d69399efce7b9c
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 7092a47829c41c605c5689ad7f3cd3ed71cb4a53)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 89dbb4c7674a42c899380cb437d69399efce7b9c)
@@ -107,8 +107,6 @@
 label.learning.choose.one.answer = Choose one of the following answers.
 label.learning.choose.at.least.one.answer = Choose at least one answer.
 label.learning.matching.pairs.pick.up = Pick up the corresponding answers
-label.learning.matching.pairs.possible = Possible answers:
-label.learning.matching.pairs.chosen = Chosen:
 label.learning.matching.pairs.choose = Choose
 label.learning.short.answer.answer = Answer:
 label.learning.true.false.true = True
@@ -118,7 +116,6 @@
 label.learning.penalty = This submission attracted a penalty of {0}.
 label.learning.finish.test = Finish
 label.learning.submit.all = Complete activity
-label.learning.submit.all.tip = Answers get autosaved automatically. Click this button only when you are happy with ALL your answers and want to see the summary page.
 label.learning.resubmit = Resubmit
 label.learning.summary.started.on = Started on
 label.learning.summary.completed.on = Completed on
@@ -447,3 +444,6 @@
 message.disclose.correct.before.groups.answers = Usually other groups' answers are disclosed before correct answers so students can discuss their choices. Are you sure you want continue?
 warn.maximum.number.words = Entered text exceeds the maximum number of words.
 label.vsa.allocate.button = Allocate VSAs
+label.learning.submit.all.tip = Answers get autosaved automatically. Click this button only when you are happy with ALL your answers and want to see the summary page.
+label.learning.matching.pairs.possible = Possible answers:
+label.learning.matching.pairs.chosen = Chosen:
Index: lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r7092a47829c41c605c5689ad7f3cd3ed71cb4a53 -r89dbb4c7674a42c899380cb437d69399efce7b9c
--- lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 7092a47829c41c605c5689ad7f3cd3ed71cb4a53)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 89dbb4c7674a42c899380cb437d69399efce7b9c)
@@ -444,3 +444,6 @@
 message.disclose.correct.before.groups.answers = Usually other groups' answers are disclosed before correct answers so students can discuss their choices. Are you sure you want continue?
 warn.maximum.number.words = Entered text exceeds the maximum number of words.
 label.vsa.allocate.button = Allocate VSAs
+label.learning.submit.all.tip = Answers get autosaved automatically. Click this button only when you are happy with ALL your answers and want to see the summary page.
+label.learning.matching.pairs.possible = Possible answers:
+label.learning.matching.pairs.chosen = Chosen:
Index: lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties
===================================================================
diff -u -ra2b7fcb20543d3f2433c4055cafa3037ef1b8dd0 -r89dbb4c7674a42c899380cb437d69399efce7b9c
--- lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision a2b7fcb20543d3f2433c4055cafa3037ef1b8dd0)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision 89dbb4c7674a42c899380cb437d69399efce7b9c)
@@ -115,7 +115,7 @@
 label.learning.marks = Puntaje: {0}/{1}.
 label.learning.penalty = Este intento atrajo a una pena de {0}.
 label.learning.finish.test = Finalizar
-label.learning.submit.all = Enviar todas las respuestas
+label.learning.submit.all = Finalizar actividad
 label.learning.resubmit = Volver a enviar
 label.learning.summary.started.on = Comenzó el
 label.learning.summary.completed.on = Finalizado el
@@ -444,3 +444,6 @@
 message.disclose.correct.before.groups.answers = Por lo general, las respuestas de otros grupos se dan a conocer antes que las respuestas correctas para que los estudiantes puedan discutir sus opciones. ¿Estás seguro de que quieres continuar?
 warn.maximum.number.words = El texto ingresado excede el número máximo de palabras.
 label.vsa.allocate.button = Asignar respuestas cortas
+label.learning.submit.all.tip = Las respuestas se guardan automáticamente. Haga clic en este botón solo cuando esté satisfecho con TODAS sus respuestas y desee ver la página de resumen.
+label.learning.matching.pairs.possible = Posibles respuestas:
+label.learning.matching.pairs.chosen = Escogido:
Index: lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r3ad974a50e8f8ea860adfb727bd1bf12831cac94 -r89dbb4c7674a42c899380cb437d69399efce7b9c
--- lams_tool_sbmt/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 3ad974a50e8f8ea860adfb727bd1bf12831cac94)
+++ lams_tool_sbmt/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 89dbb4c7674a42c899380cb437d69399efce7b9c)
@@ -124,7 +124,6 @@
 monitor.summary.date.restriction.removed = Deadline has been removed
 monitoring.user.submittedFiles = Submitted files
 output.desc.submitted.items.output.definition.sbmt = Files submitted in the Submit Files tool
-output.desc.manual.grading = Manual grading
 button.submit = Finish
 label.monitoring.file.delete = Delete mark file
 label.file.options = File options
@@ -168,3 +167,4 @@
 label.monitoring.leader.not.changed = Leader was not changed
 label.monitoring.releaseMarks.notify.button = Notify students
 label.monitoring.releaseMarks.notify.message = [0] learners were notified
+output.desc.manual.grading = Manual grading
Index: lams_tool_sbmt/conf/language/lams/ApplicationResources_el_GR.properties
===================================================================
diff -u -reba4bfd253009e2910ee42d7852a05004f14b26d -r89dbb4c7674a42c899380cb437d69399efce7b9c
--- lams_tool_sbmt/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision eba4bfd253009e2910ee42d7852a05004f14b26d)
+++ lams_tool_sbmt/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision 89dbb4c7674a42c899380cb437d69399efce7b9c)
@@ -167,3 +167,4 @@
 label.monitoring.leader.not.changed = Ο Συντονιστής δεν άλλαξε
 label.monitoring.releaseMarks.notify.button = Ειδοποίηση εκπαιδευομένων
 label.monitoring.releaseMarks.notify.message = [0] εκπαιδευόμενοι ειδοποιήθηκαν
+output.desc.manual.grading = Χειροκίνητη βαθμολόγηση
Index: lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -reba4bfd253009e2910ee42d7852a05004f14b26d -r89dbb4c7674a42c899380cb437d69399efce7b9c
--- lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision eba4bfd253009e2910ee42d7852a05004f14b26d)
+++ lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 89dbb4c7674a42c899380cb437d69399efce7b9c)
@@ -167,3 +167,4 @@
 label.monitoring.leader.not.changed = Leader was not changed
 label.monitoring.releaseMarks.notify.button = Notify students
 label.monitoring.releaseMarks.notify.message = [0] learners were notified
+output.desc.manual.grading = Manual grading
Index: lams_tool_sbmt/conf/language/lams/ApplicationResources_es_ES.properties
===================================================================
diff -u -reba4bfd253009e2910ee42d7852a05004f14b26d -r89dbb4c7674a42c899380cb437d69399efce7b9c
--- lams_tool_sbmt/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision eba4bfd253009e2910ee42d7852a05004f14b26d)
+++ lams_tool_sbmt/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision 89dbb4c7674a42c899380cb437d69399efce7b9c)
@@ -167,3 +167,4 @@
 label.monitoring.leader.not.changed = El líder no fue cambiado
 label.monitoring.releaseMarks.notify.button = Notificar a los estudiantes
 label.monitoring.releaseMarks.notify.message = Se notificó a [0] alumnos
+output.desc.manual.grading = Calificación manual
Index: lams_tool_sbmt/conf/language/lams/ApplicationResources_no_NO.properties
===================================================================
diff -u -re90a9e2263ca58f303c0f25edfc6e34726a2f606 -r89dbb4c7674a42c899380cb437d69399efce7b9c
--- lams_tool_sbmt/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision e90a9e2263ca58f303c0f25edfc6e34726a2f606)
+++ lams_tool_sbmt/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision 89dbb4c7674a42c899380cb437d69399efce7b9c)
@@ -167,3 +167,4 @@
 label.monitoring.leader.not.changed = Leder ble ikke endret
 label.monitoring.releaseMarks.notify.button = Varsle studenter
 label.monitoring.releaseMarks.notify.message = [0] studenter ble varslet
+output.desc.manual.grading = Manuell vurdering/karaktersetting