Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -re323adefc0ee1680382462d8bde75544167112bc -rf3e34d2348c360e98dc9a113d4ce52732901c2a6
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e323adefc0ee1680382462d8bde75544167112bc)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f3e34d2348c360e98dc9a113d4ce52732901c2a6)
@@ -923,15 +923,14 @@
 msg.import.file.format = The import file must be .xml file exported from assessment tool and not exceed size of {0}
 error.import.file.format = The import file is not an .xml file.
 label.qb.stats.title = Question statistics
-error.qb.permanent.remove = The question is in one collection only, so it would be permanently removed.\\n\nIt is not possible as the question is used in sequences.
+error.qb.permanent.remove = The question is in one collection only, so it would be permanently removed.\\nIt is not possible as the question is used in sequences.
 label.qb.permanent.remove.confirm = The question is in one collection only. Are you sure that you want to remove it permanently?
 label.qb.stats.question = Question
 label.qb.stats.question.version = Version
 label.qb.stats.question.title = Title
 label.qb.stats.question.description = Description
 label.qb.stats.question.feedback = Feedback
 label.qb.stats.question.mark = Mark
-label.qb.stats.options.title = Options
 label.qb.stats.option.title = Title
 label.qb.stats.option.correct = Correct?
 label.qb.stats.option.average = Average selection<br>(as first choice)
@@ -962,10 +961,6 @@
 label.qb.stats.outcomes = Learning outcomes
 label.qb.stats.outcomes.none = This question does not have any learning outcomes
 label.qb.stats.outcomes.existing = Existing outcomes
-label.qb.stats.merge.title = Merge this question with...
-label.qb.stats.merge.description = This will merge this question with the question UID you entered above. Before you do this, make sure you know what are you doing as once merging is performed this cannot be undone. 
-label.qb.stats.merge.question.uid = Question UID
-label.qb.stats.merge.now = Merge now
 label.qb.collection = Collection
 label.qb.collection.grid.title = Questions
 label.qb.collection.grid.id = ID
@@ -975,13 +970,11 @@
 label.qb.collection.grid.actions = Actions
 label.qb.collection.grid.stats = Stats
 label.qb.collection.grid.error = Error while loading grid with question collections
-label.qb.collection.name.prompt = New collection name
 label.qb.collection.name.blank.error = Name must not be blank
 label.qb.collection.name.duplicate.error = Collection with such name already exists
 label.qb.collection.action.stats = Show stats
 label.qb.collection.remove.confirm = Are you sure you want to remove "{0}" collection?
 label.qb.collection.management = Collection management
-label.qb.collection.add = Add collection
 label.qb.collection.private = Private collection
 label.qb.collection.remove = Remove collection
 label.qb.collection.xml = XML
@@ -992,8 +985,6 @@
 label.qb.collection.unshare = Unshare
 label.qb.collection.share = Share
 label.qb.collection.edit = Edit
-label.qb.collection.public.name = Public questions
-label.qb.collection.questions = questions
 error.form.validation.error = You have 1 error in a form. It has been highlighted
 error.form.validation.errors = You have {0} errors in a form. They have been highlighted
 label.authoring.choice.add.multiple.choice = Add multiple choice
@@ -1061,10 +1052,6 @@
 label.authoring.basic.option.answer = Answer
 label.authoring.basic.delete = Delete
 label.authoring.basic.none = None
-label.authoring.feeback.general = General Feedback
-label.authoring.feeback.correct = Feedback on any correct response
-label.authoring.feeback.partially.correct = Feedback on any partially correct response
-label.authoring.feeback.incorrect = Feedback on any incorrect response
 error.positive.grade.required = One of the answers should have a positive grade
 label.do.you.want.to.delete.answer = Do you want to delete this answer?
 label.choose.word.document = Choose Word file
@@ -1074,3 +1061,16 @@
 authoring.fla.page.prop.password = Password
 label.question.bank = Question Bank
 authoring.create.question.qb = From question bank...
+label.qb.stats.options.title = Options
+label.qb.stats.merge.title = Merge this question with...
+label.qb.stats.merge.description = This will merge this question with the question UID you entered above. Before you do this, make sure you know what are you doing as once merging is performed this cannot be undone. 
+label.qb.stats.merge.question.uid = Question UID
+label.qb.stats.merge.now = Merge now
+label.qb.collection.name.prompt = New collection name
+label.qb.collection.add = Add collection
+label.qb.collection.public.name = Public questions
+label.qb.collection.questions = questions
+label.authoring.feeback.general = General Feedback
+label.authoring.feeback.correct = Feedback on any correct response
+label.authoring.feeback.partially.correct = Feedback on any partially correct response
+label.authoring.feeback.incorrect = Feedback on any incorrect response
Index: lams_central/conf/language/lams/ApplicationResources_el_GR.properties
===================================================================
diff -u -r4409f4bd1640395d7eacbf1681be39628304d815 -rf3e34d2348c360e98dc9a113d4ce52732901c2a6
--- lams_central/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision 4409f4bd1640395d7eacbf1681be39628304d815)
+++ lams_central/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision f3e34d2348c360e98dc9a113d4ce52732901c2a6)
@@ -923,7 +923,7 @@
 msg.import.file.format = ο αρχείο εισαγωγής πρέπει να είναι αρχείο .xml που εξάγεται από το εργαλείο αξιολόγησης και να μην υπερβαίνει το μέγεθος του {0}
 error.import.file.format = Το αρχείο εισαγωγής δεν είναι αρχείο .xml.
 label.qb.stats.title = Στατιστικά Ερωτήσεων
-error.qb.permanent.remove = Η ερώτηση είναι μόνο σε μία συλλογή, επομένως θα αφαιρεθεί οριστικά. \\nΔεν είναι δυνατή η χρήση της ερώτησης σε ακολουθίες.
+error.qb.permanent.remove = Η ερώτηση είναι μόνο σε μία συλλογή, επομένως θα αφαιρεθεί οριστικά. \\n Δεν είναι δυνατή η χρήση της ερώτησης σε ακολουθίες.
 label.qb.permanent.remove.confirm = Η ερώτηση είναι μόνο σε μία συλλογή. Είστε βέβαιοι ότι θέλετε να την καταργήσετε μόνιμα;
 label.qb.stats.question = Ερώτηση
 label.qb.stats.question.version = Έκδοση
Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -rcaf5d6113a9c9d149ba883d2c25068f435be3cdc -rf3e34d2348c360e98dc9a113d4ce52732901c2a6
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision caf5d6113a9c9d149ba883d2c25068f435be3cdc)
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision f3e34d2348c360e98dc9a113d4ce52732901c2a6)
@@ -923,7 +923,7 @@
 msg.import.file.format = The import file must be .xml file exported from assessment tool and not exceed size of {0}
 error.import.file.format = The import file is not an .xml file.
 label.qb.stats.title = Question statistics
-error.qb.permanent.remove = The question is in one collection only, so it would be permanently removed.\\n\nIt is not possible as the question is used in sequences.
+error.qb.permanent.remove = The question is in one collection only, so it would be permanently removed.\\nIt is not possible as the question is used in sequences.
 label.qb.permanent.remove.confirm = The question is in one collection only. Are you sure that you want to remove it permanently?
 label.qb.stats.question = Question
 label.qb.stats.question.version = Version
@@ -1061,3 +1061,16 @@
 authoring.fla.page.prop.password = Password
 label.question.bank = Question Bank
 authoring.create.question.qb = From question bank...
+label.qb.stats.options.title = Options
+label.qb.stats.merge.title = Merge this question with...
+label.qb.stats.merge.description = This will merge this question with the question UID you entered above. Before you do this, make sure you know what are you doing as once merging is performed this cannot be undone. 
+label.qb.stats.merge.question.uid = Question UID
+label.qb.stats.merge.now = Merge now
+label.qb.collection.name.prompt = New collection name
+label.qb.collection.add = Add collection
+label.qb.collection.public.name = Public questions
+label.qb.collection.questions = questions
+label.authoring.feeback.general = General Feedback
+label.authoring.feeback.correct = Feedback on any correct response
+label.authoring.feeback.partially.correct = Feedback on any partially correct response
+label.authoring.feeback.incorrect = Feedback on any incorrect response
Index: lams_central/conf/language/lams/ApplicationResources_es_ES.properties
===================================================================
diff -u -r13f3e7acf738bee2a21ace1c0694894bd1f48cdc -rf3e34d2348c360e98dc9a113d4ce52732901c2a6
--- lams_central/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision 13f3e7acf738bee2a21ace1c0694894bd1f48cdc)
+++ lams_central/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision f3e34d2348c360e98dc9a113d4ce52732901c2a6)
@@ -923,7 +923,7 @@
 msg.import.file.format = El archivo a importar debe ser un archivo .xml exportado desde la herramienta de Exámenes y no debe exceder el tamaño de {0}
 error.import.file.format = El archivo no es en formato .xml.
 label.qb.stats.title = Estadísticas de la pregunta
-error.qb.permanent.remove = La pregunta se encuentra solo en una colección, por lo que se eliminará permanentemente. \\n \n No es posible ya que la pregunta se usa en secuencias.
+error.qb.permanent.remove = La pregunta se encuentra solo en una colección, por lo que se eliminará permanentemente. \\n No es posible ya que la pregunta se usa en secuencias.
 label.qb.permanent.remove.confirm = La pregunta está en una sola colección. ¿Está seguro de que quiere eliminarla permanentemente?
 label.qb.stats.question = Pregunta
 label.qb.stats.question.version = Versión
@@ -1061,3 +1061,16 @@
 authoring.fla.page.prop.password = Contraseña
 label.question.bank = Banco de preguntas
 authoring.create.question.qb = Banco de preguntas...
+label.qb.stats.options.title = Opciones
+label.qb.stats.merge.title = Fusiona esta pregunta con...
+label.qb.stats.merge.description = Esto fusionará esta pregunta con la pregunta UID que introdujo anteriormente. Antes de hacer esto, asegúrese de saber qué está haciendo ya que una vez que la fusión se realiza esto no se puede deshacer. 
+label.qb.stats.merge.question.uid = Pregunta UID
+label.qb.stats.merge.now = Fusionar ahora
+label.qb.collection.name.prompt = Nuevo nombre de colección
+label.qb.collection.add = Añadir colección
+label.qb.collection.public.name = Preguntas públicas
+label.qb.collection.questions = preguntas
+label.authoring.feeback.general = Retroalimentación general
+label.authoring.feeback.correct = Retroalimentación para cualquier respuesta correcta
+label.authoring.feeback.partially.correct = Retroalimentación para cualquier respuesta parcialmente correcta
+label.authoring.feeback.incorrect = Retroalimentación para cualquier respuesta incorrecta
Index: lams_central/conf/language/lams/ApplicationResources_no_NO.properties
===================================================================
diff -u -rcaf5d6113a9c9d149ba883d2c25068f435be3cdc -rf3e34d2348c360e98dc9a113d4ce52732901c2a6
--- lams_central/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision caf5d6113a9c9d149ba883d2c25068f435be3cdc)
+++ lams_central/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision f3e34d2348c360e98dc9a113d4ce52732901c2a6)
@@ -923,7 +923,7 @@
 msg.import.file.format = Import filen må være en .xml fil som er eksportert fra godkjenningsverktøyet og ikke overskride en størrelse på  {0}
 error.import.file.format = Import fila er ikke en .XMLfil
 label.qb.stats.title = Spørsmålsstatistikk
-error.qb.permanent.remove = Spørsmålet er kun i en samling, slik at den fjernes permanent. \\n\nDet er ikke mulig fordi spørsmålet er benyttet i en sekvens
+error.qb.permanent.remove = Spørsmålet er kun i en samling, slik at den fjernes permanent. \\n Det er ikke mulig fordi spørsmålet er benyttet i en sekvens
 label.qb.permanent.remove.confirm = Spørsmålet er i en samling.Vil du fjerne den fullstendig ?
 label.qb.stats.question = Spørsmål
 label.qb.stats.question.version = Versjon
Index: lams_tool_assessment/conf/language/lams/ApplicationResources_no_NO.properties
===================================================================
diff -u -r13f3e7acf738bee2a21ace1c0694894bd1f48cdc -rf3e34d2348c360e98dc9a113d4ce52732901c2a6
--- lams_tool_assessment/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision 13f3e7acf738bee2a21ace1c0694894bd1f48cdc)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision f3e34d2348c360e98dc9a113d4ce52732901c2a6)
@@ -393,3 +393,15 @@
 label.authoring.advance.answer.justification = Aktivere svarbegrunnelse
 label.answer.justification = Din begrunnelse:
 label.answer.justification.prompt = Begrunn svaret ditt ...
+label.comment.name = Navn, gruppe, dato
+label.your.team = Ditt lag
+label.not.yet.disclosed = Læreren har ikke offentliggjort andre lags svar ennå
+label.rating = Vurdering
+label.comment = Kommentar
+label.comment.date = Dato
+label.answer.rating.title = Svarene til andre grupper
+label.average.rating = Gjennomsnittlig vurdering {0} / {1} stemmer
+label.your.rating = Din vurdering {0} , gjennomsnittsvurdering {1} / {2} stemmer
+label.comment.textarea.tip = Skriv kommentaren din her og klikk på den grønne krysset
+error.resource.image.comment.blank = Kommentarfeltet kan ikke være tomt
+label.student.choices = Studentenes valg
Index: lams_tool_preview/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rf924ee00f89e1ed8d57f764fbd8a21c5c03858c5 -rf3e34d2348c360e98dc9a113d4ce52732901c2a6
--- lams_tool_preview/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f924ee00f89e1ed8d57f764fbd8a21c5c03858c5)
+++ lams_tool_preview/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f3e34d2348c360e98dc9a113d4ce52732901c2a6)
@@ -10,7 +10,7 @@
 label.authoring.heading.basic = Basic
 label.authoring.heading.advance = Advanced
 label.authoring.basic.title = Title
-label.authoring.basic.instruction = Instruction
+label.authoring.basic.instruction = Instructions
 label.authoring.basic.resource.preview = Preview
 label.authoring.advance.lock.on.finished = Lock when finished
 label.authoring.save.button = Save
@@ -19,7 +19,7 @@
 authoring.msg.cancel.save = Do you want to close this window without saving?
 label.learning.title = Peer Review Learning
 monitoring.tab.summary = Summary
-monitoring.tab.statistics = Statistic
+monitoring.tab.statistics = Statistics
 monitoring.tab.edit.activity = Edit Activity
 monitoring.label.group = Group
 monitoring.label.number.learners = Number of learners
@@ -194,5 +194,7 @@
 email.explanation.SAPA.less = SAPA < {0}
 email.explanation.SAPA.range = SAPA >= {0} and <= {1}
 email.explanation.SAPA.greater = SAPA > {0}
+# Stands for Self-Assessment
 label.sa = SA
+# Stands for Peer Assessment
 label.pa = PA
Index: lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -rf924ee00f89e1ed8d57f764fbd8a21c5c03858c5 -rf3e34d2348c360e98dc9a113d4ce52732901c2a6
--- lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision f924ee00f89e1ed8d57f764fbd8a21c5c03858c5)
+++ lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision f3e34d2348c360e98dc9a113d4ce52732901c2a6)
@@ -10,7 +10,7 @@
 label.authoring.heading.basic = Basic
 label.authoring.heading.advance = Advanced
 label.authoring.basic.title = Title
-label.authoring.basic.instruction = Instruction
+label.authoring.basic.instruction = Instructions
 label.authoring.basic.resource.preview = Preview
 label.authoring.advance.lock.on.finished = Lock when finished
 label.authoring.save.button = Save
@@ -19,7 +19,7 @@
 authoring.msg.cancel.save = Do you want to close this window without saving?
 label.learning.title = Peer Review Learning
 monitoring.tab.summary = Summary
-monitoring.tab.statistics = Statistic
+monitoring.tab.statistics = Statistics
 monitoring.tab.edit.activity = Edit Activity
 monitoring.label.group = Group
 monitoring.label.number.learners = Number of learners
@@ -194,5 +194,7 @@
 email.explanation.SAPA.less = SAPA < {0}
 email.explanation.SAPA.range = SAPA >= {0} and <= {1}
 email.explanation.SAPA.greater = SAPA > {0}
+# Stands for Self-Assessment
 label.sa = SA
+# Stands for Peer Assessment
 label.pa = PA
Index: lams_tool_preview/conf/language/lams/ApplicationResources_es_ES.properties
===================================================================
diff -u -rf924ee00f89e1ed8d57f764fbd8a21c5c03858c5 -rf3e34d2348c360e98dc9a113d4ce52732901c2a6
--- lams_tool_preview/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision f924ee00f89e1ed8d57f764fbd8a21c5c03858c5)
+++ lams_tool_preview/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision f3e34d2348c360e98dc9a113d4ce52732901c2a6)
@@ -1,5 +1,5 @@
 activity.title = Evaluación por Pares
-activity.description = Evaluación
+activity.description = Evaluación de Pares
 activity.helptext = Evaluación de Pares
 tool.display.name = Herramienta para diseñar evaluaciones que puedan ser utilizadas por estudiantes para evaluar a sus pares.
 tool.description = Herramienta para diseñar evaluaciones que puedan ser utilizadas por estudiantes para evaluar a sus pares.
@@ -194,5 +194,7 @@
 email.explanation.SAPA.less = SAPA < {0}
 email.explanation.SAPA.range = SAPA >= {0} y <= {1}
 email.explanation.SAPA.greater = SAPA > {0}
+# Stands for Self-Assessment
 label.sa = SA
+# Stands for Peer Assessment
 label.pa = PA
Index: lams_tool_preview/conf/language/lams/ApplicationResources_no_NO.properties
===================================================================
diff -u -r9606e391610a97bac6305e0e9c42e574f01bd84f -rf3e34d2348c360e98dc9a113d4ce52732901c2a6
--- lams_tool_preview/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision 9606e391610a97bac6305e0e9c42e574f01bd84f)
+++ lams_tool_preview/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision f3e34d2348c360e98dc9a113d4ce52732901c2a6)
@@ -188,3 +188,13 @@
 outcome.authoring.create.new = [lag ny]
 label.sapa.factor = SAPA-faktor
 label.authoring.advanced.tolearnce = Toleranse av SA- og SAPA-faktorer (hundredel, 0,0x)
+email.explanation.SPA.less = SPA < {0}
+email.explanation.SPA.range = SPA > = {0} og < = {1}
+email.explanation.SPA.greater = SPA > {0}
+email.explanation.SAPA.less = SAPA < {0}
+email.explanation.SAPA.range = SAPA > = {0} og < = {1}
+email.explanation.SAPA.greater = SAPA > {0}
+# Stands for Self-Assessment
+label.sa = SA
+# Stands for Peer Assessment
+label.pa = PA
Index: lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties
===================================================================
diff -u -r13f3e7acf738bee2a21ace1c0694894bd1f48cdc -rf3e34d2348c360e98dc9a113d4ce52732901c2a6
--- lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision 13f3e7acf738bee2a21ace1c0694894bd1f48cdc)
+++ lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision f3e34d2348c360e98dc9a113d4ce52732901c2a6)
@@ -156,7 +156,7 @@
 label.confirm = Επιβεβαίωση
 label.task.options = Επιλογές εργασλείου
 label.activity.completion = Ολοκλήρωση δραστηριότητας
-errors.maxfilesize = Το αποστελόμενο αρχείο υπερβαίνει το μέγιστο μέγεθος: {0}
+errors.maxfilesize = Το αποσταλλόμενο αρχείο υπερβαίνει το μέγιστο μέγεθος: {0}
 error.attachment.executable = Το αποστελλόμενο αρχείο είναι εκτελέσιμο
 label.upload.info = Το αποστελλόμενο αρχείο δεν πρέπει να είναι εκτελέσιμο και να μην υπερβαίνει το μέγεθος του {0}
 outcome.authoring.title = Μαθησιακά αποτελέσματα