Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

main/lang/english/trad4all.inc.php

@@ -2896,7 +2896,7 @@ $TryAgain = "Try again";
 $SeeTheory = "Theory link";
 $EndActivity = "End of activity";
 $NoFeedback = "Exam (no feedback)";
-$DirectFeedback = "Self-evaluation (immediate feedback)";
+$DirectFeedback = "Adaptative test with immediate feedback";
 $FeedbackType = "Feedback";
 $Scenario = "Scenario";
 $VisitUrl = "Visit this link";
@@ -3855,7 +3855,7 @@ $NoResultsInPresenceSheet = "No presence registered";
 $EditPresences = "Modify presences";
 $TotalWeightMustNotBeMoreThan = "Total weight must not be more than";
 $ThereIsNotACertificateAvailableByDefault = "There is no certificate available by default";
-$CertificateMinimunScoreIsRequiredAndMustNotBeMoreThan = "Certificate minimun score is required and must not be more than";
+$CertificateMinimunScoreIsRequiredAndMustNotBeMoreThan = "Certificate minimum score is required and must not be more than";
 $CourseProgram = "Description";
 $ThisCourseDescriptionIsEmpty = "There is no course description so far.";
 $Vacancies = "Vacancies";
@@ -4378,7 +4378,7 @@ $Annotate = "Notify";
 $DayOfDelay = "Day of delay";
 $NoProduction = "No production";
 $NoComment = "No comment";
-$LatestLogin = "Latest";
+$LatestLogin = "Latest login";
 $TimeSpentOnThePlatform = "Time spent in portal";
 $AveragePostsInForum = "Posts in forum";
 $AverageAssignments = "Average assignments per learner";
@@ -6062,7 +6062,7 @@ $TotalStudents = "Total learners";
 $FilteringWithScoreX = "Filtering with score %s";
 $ExamTaken = "Taken";
 $ExamNotTaken = "Not taken";
-$ExamPassX = "Pass minimun %s";
+$ExamPassX = "Pass minimum %s";
 $ExamFail = "Fail";
 $ExamTracking = "Exam tracking";
 $NoAttempt = "No attempts";
@@ -8420,4 +8420,6 @@ $HideTotalScore = "Hide total score";
 $HideQuestionScore = "Hide question score";
 $SaveAnswers = "Save answers";
 $SaveAllAnswers = "Pre-fill with answers from previous attempt";
+$SubscribeUsersToAllForumNotifications = "Subscribe automatically all users to all forum notifications";
+$ExerciseDirectPopUp = "Direct feedback as pop-up";
 ?>

main/lang/french/trad4all.inc.php

@@ -2886,7 +2886,7 @@ $TryAgain = "Réessayer";
 $SeeTheory = "Voir la théorie";
 $EndActivity = "Fin de l'activité";
 $NoFeedback = "Pas de feedback";
-$DirectFeedback = "Immédiat en popup";
+$DirectFeedback = "Test adaptatif avec feedback immédiat";
 $FeedbackType = "Feedback";
 $Scenario = "Scénario";
 $VisitUrl = "Suivre ce lien";
@@ -8352,4 +8352,6 @@ $HideTotalScore = "Cacher le score total";
 $HideQuestionScore = "Cacher le score de chaque question";
 $SaveAnswers = "Garder les réponses";
 $SaveAllAnswers = "Préremplir avec les réponses de la tentative précédente";
+$SubscribeUsersToAllForumNotifications = "Abonner automatiquement tous les utilisateurs";
+$ExerciseDirectPopUp = "Feedback immédiat en pop-up";
 ?>

main/lang/spanish/trad4all.inc.php

@@ -2896,7 +2896,7 @@ $TryAgain = "Intenta otra vez";
 $SeeTheory = "Revisar la teoría";
 $EndActivity = "Fin de la actividad";
 $NoFeedback = "Examen (sin retroalimentación)";
-$DirectFeedback = "Autoevaluación (retroalimentación inmediata)";
+$DirectFeedback = "Prueba adaptativa con retroalimentación inmediata";
 $FeedbackType = "Retro-alimentación";
 $Scenario = "Escenario";
 $VisitUrl = "Visitar esta dirección";
@@ -8448,4 +8448,6 @@ $HideTotalScore = "Esconder la puntuación total";
 $HideQuestionScore = "Esconder la puntuación de preguntas";
 $SaveAnswers = "Guardar respuestas";
 $SaveAllAnswers = "Prellenar con las respuestas del intento anterior";
+$SubscribeUsersToAllForumNotifications = "Inscripción automatica de todos los usuarios a todas las notificaciones de forum";
+$ExerciseDirectPopUp = "Retroalimentación inmediata como pop-up";
 ?>