Merge

main/lang/english/exercice.inc.php

@@ -356,4 +356,6 @@ $NotMarkActivity = "Not possible mark this activity";
 $YouHaveToCreateAtLeastOneAnswer = "You have to create at least one answer";
 $YouHaveToCreateAtLeastOneAnswer = "You have to create at least one answer";
 $ExerciseAttempted = "Exercise attempted";
+$MultipleSelectCombination = "Multiple select combination";
+$MultipleAnswerCombination = "Multiple answer combination";
 ?>

main/lang/spanish/exercice.inc.php

@@ -355,5 +355,7 @@ $RandomAnswers = "Barajar respuestas";
 $NotMarkActivity = "No es posible calificar este elemento";
 $YouHaveToCreateAtLeastOneAnswer = "Tienes que crear al menos una respuesta";
 $YouHaveToCreateAtLeastOneAnswer = "Tienes que crear al menos una respuesta";
-$ExerciseAttempted = "Intentar ejercicio";
+$ExerciseAttempted = "Un estudiante ha contestado una pregunta";
+$MultipleSelectCombination = "Combinación de selección multiple";
+$MultipleAnswerCombination = "Combinación de respuesta multiple";
 ?>