Index: lams_admin/conf/language/lams/ApplicationResources_no_NO.properties
===================================================================
diff -u -r2d3c74d54fc59c736099961fb33d9d1dd30263d0 -ra2b7fcb20543d3f2433c4055cafa3037ef1b8dd0
--- lams_admin/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision 2d3c74d54fc59c736099961fb33d9d1dd30263d0)
+++ lams_admin/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision a2b7fcb20543d3f2433c4055cafa3037ef1b8dd0)
@@ -653,11 +653,15 @@
 config.password.expiration = Passord utløper om måneder (0 = aldri)
 config.password.history = Forby gjenbruk av passord for et minimum antall generasjoner (0 = av)
 label.password.user.details = må ikke være det samme som brukerinnlogging, ID, e-post eller navn
+label.password.common = kan ikke være likt
 tool.groups.open.button = Administer verktøy grupper
 tool.groups.open.button.tooltip = Administrasjon av verktøygrupper
+tool.groups.dialog.title = Styring av verktøygrupper
 tool.groups.dialog.instructions = Legg til gruppe
+tool.groups.add.group.button = Legg til gruppe
 tool.groups.remove.group.button.tooltip = Fjern gruppe
 tool.groups.group.default.name = Uten tittel
 tool.groups.remove.confirm = Er du sikker på at du vil fjerne denne gruppen ?
 tool.groups.group.name.error = Et gruppenavn kan ikke være tomt
 tool.groups.save.error = Feil ved lagring av grupper
+config.login.as.enable = Aktiver påloggingsfunksjonen for administratorer
Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rf9cae5b21c66ce71a10d3e930fe8e40e265d2536 -ra2b7fcb20543d3f2433c4055cafa3037ef1b8dd0
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f9cae5b21c66ce71a10d3e930fe8e40e265d2536)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision a2b7fcb20543d3f2433c4055cafa3037ef1b8dd0)
@@ -554,7 +554,7 @@
 authoring.fla.page.menu.flow = Flow
 authoring.fla.page.menu.flow.gate = Gate
 authoring.fla.page.menu.flow.branch = Branch
-authoring.fla.page.menu.group = Group
+authoring.fla.page.menu.group = Grouping
 authoring.fla.page.menu.annotate = Annotate
 authoring.fla.page.menu.annotate.label = Label
 authoring.fla.page.menu.annotate.region = Region
Index: lams_central/conf/language/lams/ApplicationResources_el_GR.properties
===================================================================
diff -u -r8f403d20b0450710b005708d16bc92bd1e5bf6f4 -ra2b7fcb20543d3f2433c4055cafa3037ef1b8dd0
--- lams_central/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision 8f403d20b0450710b005708d16bc92bd1e5bf6f4)
+++ lams_central/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision a2b7fcb20543d3f2433c4055cafa3037ef1b8dd0)
@@ -1120,3 +1120,5 @@
 label.qb.collection.remove.questions.tooltip = Καταργήστε όλες τις επιλεγμένες ερωτήσεις από τη συλλογή. Εάν υπάρχουν μόνο σε αυτή τη συλλογή, θα αφαιρεθούν οριστικά. 
 label.qb.collection.remove.questions.fail = Οι ερωτήσεις μπορούν να αφαιρεθούν/διαγραφούν από τη συλλογή μόνο εάν δεν έχουν χρησιμοποιηθεί σε δραστηριότητα αξιολόγησης.  Εάν η ερώτηση έχει ήδη χρησιμοποιηθεί, δεν θα διαγραφεί.
 label.authoring.short.answer.hint = Σε κάθε πλαίσιο επιλογών πληκτρολογήστε τις απαντήσεις σε ξεχωριστές γραμμές.
+label.vsa.allocate.button = Εκχώρηση VSAs
+label.vsa.allocate.description = Κατανομή των απαντήσεων των εκπαιδευόμενων με σύρσιμο και απόθεση των σωστών επιλογών
Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r48340d4d314a3487c1ac43f91415cf57955b555e -ra2b7fcb20543d3f2433c4055cafa3037ef1b8dd0
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 48340d4d314a3487c1ac43f91415cf57955b555e)
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision a2b7fcb20543d3f2433c4055cafa3037ef1b8dd0)
@@ -554,7 +554,7 @@
 authoring.fla.page.menu.flow = Flow
 authoring.fla.page.menu.flow.gate = Gate
 authoring.fla.page.menu.flow.branch = Branch
-authoring.fla.page.menu.group = Group
+authoring.fla.page.menu.group = Grouping
 authoring.fla.page.menu.annotate = Annotate
 authoring.fla.page.menu.annotate.label = Label
 authoring.fla.page.menu.annotate.region = Region
@@ -1120,3 +1120,7 @@
 label.qb.collection.remove.questions.tooltip = Remove all selected questions from the collection. If they are present only in this collection, they will be permanently removed. 
 label.qb.collection.remove.questions.fail = Questions can only be removed/deleted from the collection if they have not been used in an assessment activity.  If the question is already in used, it will not be deleted.
 label.authoring.short.answer.hint = In each option box type answers in separate lines.
+label.vsa.allocate.button = Allocate VSAs
+label.vsa.allocate.description = Allocate students' answers by dragging and dropping them to correct options
+label.vsa.deallocate.button.tip = Click to move answer back to queue
+label.vsa.deallocate.confirm = Are you sure you want to mark this answer as not correct? Students' scores will be recalculated.
Index: lams_central/conf/language/lams/ApplicationResources_es_ES.properties
===================================================================
diff -u -r53dbc37b6825194501d9f178308323373eebc3fa -ra2b7fcb20543d3f2433c4055cafa3037ef1b8dd0
--- lams_central/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision 53dbc37b6825194501d9f178308323373eebc3fa)
+++ lams_central/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision a2b7fcb20543d3f2433c4055cafa3037ef1b8dd0)
@@ -1120,3 +1120,7 @@
 label.qb.collection.remove.questions.tooltip = Eliminar todas las preguntas seleccionadas de la colección. Si sólo están presentes en esta colección, se eliminarán de forma permanente. 
 label.qb.collection.remove.questions.fail = Las preguntas sólo se pueden eliminar/borrar de la colección si no se han utilizado en una actividad de evaluación. De ser el caso, no se podrán borrar de la colección.
 label.authoring.short.answer.hint = En cada casilla de opción, escriba las respuestas en líneas separadas.
+label.vsa.allocate.button = Asignar respuestas cortas
+label.vsa.allocate.description = Asigne las respuestas de los estudiantes arrastrándolas y soltándolas para corregir las opciones
+label.vsa.deallocate.button.tip = Haga clic para mover la respuesta a la cola
+label.vsa.deallocate.confirm = ¿Estás seguro de que quieres marcar esta respuesta como no correcta? Los puntajes de los estudiantes serán recalculados.
Index: lams_central/conf/language/lams/ApplicationResources_zh_CN.properties
===================================================================
diff -u -r93d954637a2fb750ae57e7c53d01cf1c812eebb0 -ra2b7fcb20543d3f2433c4055cafa3037ef1b8dd0
--- lams_central/conf/language/lams/ApplicationResources_zh_CN.properties	(.../ApplicationResources_zh_CN.properties)	(revision 93d954637a2fb750ae57e7c53d01cf1c812eebb0)
+++ lams_central/conf/language/lams/ApplicationResources_zh_CN.properties	(.../ApplicationResources_zh_CN.properties)	(revision a2b7fcb20543d3f2433c4055cafa3037ef1b8dd0)
@@ -18,7 +18,7 @@
 label.user.guide = [帮助]
 msg.loading = 登录中...
 msg.LAMS.version = 学习活动管理系统
-msg.LAMS.copyright.short = 2002-2008 华中师范大教育信息技术工程研究中心.
+msg.LAMS.copyright.short = 2002 年起 LAMS 基金会。
 button.save = 保存
 button.cancel = 取消
 no.such.learningdesign.exist = 没有号码为 {0} 的学习设计存在。
@@ -90,7 +90,7 @@
 msg.reason.is = 原因是
 button.close = 关闭
 button.import = 导入
-msg.LAMS.copyright.statement.1 = LAMS™ © 2002-2008 LAMS Foundation.
+msg.LAMS.copyright.statement.1 = LAMS™ © 2002 onwards LAMS Foundation.
 msg.LAMS.copyright.statement.2 = LAMS是LAMS基金会的一个商标 (http://lamsfoundation.org).
 msg.LAMS.copyright.statement.3 = 该程序是一个免费软件。 GNU GPL v2
 title.export = 导出工具内容
Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r3085af1c7e3e6c3496af23a748d998886d7168fd -ra2b7fcb20543d3f2433c4055cafa3037ef1b8dd0
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 3085af1c7e3e6c3496af23a748d998886d7168fd)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision a2b7fcb20543d3f2433c4055cafa3037ef1b8dd0)
@@ -259,7 +259,6 @@
 label.info.maximum.number.words = This answer must have a maximum of {0} words.
 label.info.minimum.number.words = This answer must have a minimum of {0} words.
 label.info.max.and.min.number.words = This answer must have a minimal of {0} and maximum of {1} words.
-warn.maximum.number.words = Entered text exceeds the maximum number of words.
 warn.answers.word.requirements.limit = In order to continue, please note the word limit restrictions.
 label.words = Words:
 message.no.reflection.available = No notebook entry has been added.
@@ -443,4 +442,5 @@
 label.authoring.advance.discussion.tooltip = When enabled, in TBL monitoring, teachers are able to start instant polls for each question to assess the students' understanding.
 label.learning.draft.autosave.error = It seems that you have lost connection to the server. Check your internet connection and click OK. If this keeps happening, please inform your teacher.
 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?
-label.vsa.allocate.button = Allocate VSAs
\ No newline at end of file
+warn.maximum.number.words = Entered text exceeds the maximum number of words.
+label.vsa.allocate.button = Allocate VSAs
Index: lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties
===================================================================
diff -u -reba4bfd253009e2910ee42d7852a05004f14b26d -ra2b7fcb20543d3f2433c4055cafa3037ef1b8dd0
--- lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision eba4bfd253009e2910ee42d7852a05004f14b26d)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision a2b7fcb20543d3f2433c4055cafa3037ef1b8dd0)
@@ -442,3 +442,5 @@
 label.authoring.advance.discussion.tooltip = Όταν είναι ενεργοποιημένη, από την παρακολούθηση TBL, οι εκπαιδευτικοί μπορούν να ξεκινήσουν άμεσες δημοσκοπήσεις για κάθε ερώτηση για να αξιολογήσουν την κατανόηση των εκπαιδευόμενων.
 label.learning.draft.autosave.error = Φαίνεται ότι έχετε χάσει τη σύνδεση με τον διακομιστή. Ελέγξτε τη σύνδεσή σας στο Διαδίκτυο και κάντε κλικ στο OK. Εάν αυτό  συνεχίσει να συμβαίνει, ενημερώστε τον εκπαιδευτικό σας.
 message.disclose.correct.before.groups.answers = Συνήθως οι απαντήσεις άλλων ομάδων αποκαλύπτονται πριν από τις σωστές απαντήσεις, ώστε οι μαθητές να μπορούν να συζητήσουν τις επιλογές τους. Είστε βέβαιοι ότι θέλετε να συνεχίσετε;
+warn.maximum.number.words = Το εισαγόμενο κείμενο υπερβαίνει τον μέγιστο αριθμό λέξεων.
+label.vsa.allocate.button = Εκχώρηση VSAs
Index: lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r93d954637a2fb750ae57e7c53d01cf1c812eebb0 -ra2b7fcb20543d3f2433c4055cafa3037ef1b8dd0
--- lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 93d954637a2fb750ae57e7c53d01cf1c812eebb0)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision a2b7fcb20543d3f2433c4055cafa3037ef1b8dd0)
@@ -442,5 +442,5 @@
 label.authoring.advance.discussion.tooltip = When enabled, in TBL monitoring, teachers are able to start instant polls for each question to assess the students' understanding.
 label.learning.draft.autosave.error = It seems that you have lost connection to the server. Check your internet connection and click OK. If this keeps happening, please inform your teacher.
 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.vsa.allocate.description = Allocate students' answers by dragging and dropping them to correct options
Index: lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties
===================================================================
diff -u -r93d954637a2fb750ae57e7c53d01cf1c812eebb0 -ra2b7fcb20543d3f2433c4055cafa3037ef1b8dd0
--- lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision 93d954637a2fb750ae57e7c53d01cf1c812eebb0)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision a2b7fcb20543d3f2433c4055cafa3037ef1b8dd0)
@@ -442,5 +442,5 @@
 label.authoring.advance.discussion.tooltip = Cuando se activa, en la interfaz de seguimiento de TBL, los profesores pueden iniciar encuestas instantáneas para cada pregunta para evaluar la comprensión de los estudiantes.
 label.learning.draft.autosave.error = Parece que ha perdido la conexión con el servidor. Compruebe su conexión a Internet y haga clic en Aceptar. Si esto sigue sucediendo, informe al instructor.
 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.vsa.allocate.description = Asigne las respuestas de los estudiantes arrastrándolas y soltándolas para corregir las opciones
Index: lams_tool_laqa/conf/language/lams/ApplicationResources_el_GR.properties
===================================================================
diff -u -ra894834371005d85f61ccb5ed33e0a47a15af8cd -ra2b7fcb20543d3f2433c4055cafa3037ef1b8dd0
--- lams_tool_laqa/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision a894834371005d85f61ccb5ed33e0a47a15af8cd)
+++ lams_tool_laqa/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision a2b7fcb20543d3f2433c4055cafa3037ef1b8dd0)
@@ -109,7 +109,7 @@
 count.finished.session = Αριθμός ολοκληρωμένων συνεδριών
 label.feedback.seq = Αριθμός ερωτήσεων δραστηριότητας:
 label.feedback.combined = Σε αυτή τη δραστηριότητα συμμετέχουν:
-label.questions.simple = ερωτήσεις.
+label.questions.simple =  ερωτήσεις.
 label.questions.remaining = Υπόλοιπες ερωτήσεις
 label.end.questions = Τέλος των ερωτήσεων
 label.lockWhenFinished = Να κλειδωθεί όταν ολοκληρωθεί
Index: lams_tool_preview/conf/language/lams/ApplicationResources_no_NO.properties
===================================================================
diff -u -reba4bfd253009e2910ee42d7852a05004f14b26d -ra2b7fcb20543d3f2433c4055cafa3037ef1b8dd0
--- lams_tool_preview/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision eba4bfd253009e2910ee42d7852a05004f14b26d)
+++ lams_tool_preview/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision a2b7fcb20543d3f2433c4055cafa3037ef1b8dd0)
@@ -198,3 +198,12 @@
 label.sa = SA
 # Stands for Peer Assessment
 label.pa = PA
+email.crtieria.table.explanation = Vurdering mottatt av studenten sammenlignet med gjennomsnitt
+confirm.notify.user.of.results = Du er i ferd med å sende resultatene av kollegaevaluering på e-post til alle studenter. Er du sikker på at du vil gjøre dette nå?
+label.rating.style.rubrics = Vurderingsmatriser
+label.rating.rubrics.column.headers = Kolonneoverskrifter
+label.rating.rubrics.column.content = Kolonneinnhold
+label.rating.rubrics.column.add = Legg til kolonne
+label.rating.rubrics.row.add = Legg til ny linje
+label.rating.rubrics.expand.all = Utvid alle
+label.rating.rubrics.error.rate = Feil oppsto mens du lagret svaret
Index: lams_tool_sbmt/conf/language/lams/ApplicationResources_no_NO.properties
===================================================================
diff -u -reba4bfd253009e2910ee42d7852a05004f14b26d -ra2b7fcb20543d3f2433c4055cafa3037ef1b8dd0
--- lams_tool_sbmt/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision eba4bfd253009e2910ee42d7852a05004f14b26d)
+++ lams_tool_sbmt/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision a2b7fcb20543d3f2433c4055cafa3037ef1b8dd0)
@@ -164,3 +164,5 @@
 label.monitoring.change.leader = Bytt leder
 label.monitoring.leader.successfully.changed = Leder er endret
 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
Index: lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties
===================================================================
diff -u -r27529f93003e9c7aaa703d559104b1de95135205 -ra2b7fcb20543d3f2433c4055cafa3037ef1b8dd0
--- lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision 27529f93003e9c7aaa703d559104b1de95135205)
+++ lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision a2b7fcb20543d3f2433c4055cafa3037ef1b8dd0)
@@ -314,3 +314,4 @@
 label.monitoring.discussion.start = Έναρξη συζήτησης
 label.authoring.advanced.discussion = Ενεργοποίηση ψηφοφορίας συζήτησης συναισθημάτων
 label.authoring.advanced.discussion.tooltip = Όταν είναι ενεργοποιημένη, από την παρακολούθηση TBL, οι εκπαιδευτικοί μπορούν να ξεκινήσουν άμεσες δημοσκοπήσεις για κάθε ερώτηση για να αξιολογήσουν την κατανόηση των εκπαιδευόμενων.
+label.vsa.allocate.button = Εκχώρηση VSAs
Index: lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -reba4bfd253009e2910ee42d7852a05004f14b26d -ra2b7fcb20543d3f2433c4055cafa3037ef1b8dd0
--- lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision eba4bfd253009e2910ee42d7852a05004f14b26d)
+++ lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision a2b7fcb20543d3f2433c4055cafa3037ef1b8dd0)
@@ -314,3 +314,4 @@
 label.monitoring.discussion.start = Start discussion sentiment
 label.authoring.advanced.discussion = Enable discussion sentiment voting
 label.authoring.advanced.discussion.tooltip = When enabled, in TBL monitoring, teachers are able to start instant polls for each burning question to assess the students' understanding.
+label.vsa.allocate.button = Allocate VSAs
Index: lams_tool_scratchie/conf/language/lams/ApplicationResources_es_ES.properties
===================================================================
diff -u -reba4bfd253009e2910ee42d7852a05004f14b26d -ra2b7fcb20543d3f2433c4055cafa3037ef1b8dd0
--- lams_tool_scratchie/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision eba4bfd253009e2910ee42d7852a05004f14b26d)
+++ lams_tool_scratchie/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision a2b7fcb20543d3f2433c4055cafa3037ef1b8dd0)
@@ -314,3 +314,4 @@
 label.monitoring.discussion.start = Iniciar el debate
 label.authoring.advanced.discussion = Habilitar la votación de sentimiento de debate
 label.authoring.advanced.discussion.tooltip = Cuando se activa, en la interfaz de seguimiento de TBL, los profesores pueden iniciar encuestas instantáneas para cada pregunta para evaluar la comprensión de los estudiantes.
+label.vsa.allocate.button = Asignar respuestas cortas