Merge OpenOLAT 11.4 to OpenOLAT default branch with 4efe5026c50d99c7aad863b043a8e85fbe64983d

src/main/java/org/olat/admin/user/delete/service/UserDeletionManager.java

@@ -149,7 +149,7 @@ public class UserDeletionManager extends BasicManager {
 				logDebug(" Try to send Delete-email to identity=" + identity.getName() + " with email=" + identity.getUser().getProperty(UserConstants.EMAIL, null));
 				
 				MailerResult result = new MailerResult();
-				MailBundle bundle = mailManager.makeMailBundle(null, identity, template, sender, null, result);
+				MailBundle bundle = mailManager.makeMailBundle(null, identity, template, null, null, result);
 				if(bundle != null) {
 					mailManager.sendMessage(bundle);
 				}

src/main/java/org/olat/course/nodes/iq/QTI21EditForm.java

@@ -107,6 +107,9 @@ public class QTI21EditForm extends FormBasicController {
 			translate("correction.manual")
 		};
 		correctionModeEl = uifactory.addRadiosVertical("correction.mode", "correction.mode", formLayout, correctionModeKeys, correctionModeValues);
+		correctionModeEl.setHelpText(translate("correction.mode.help"));
+		correctionModeEl.setHelpUrlForManualPage("Test editor QTI 2.1 in detail#details_testeditor_test_konf_kurs");
+
 		String mode = modConfig.getStringValue(IQEditController.CONFIG_CORRECTION_MODE);
 		boolean selected = false;
 		for(String correctionModeKey:correctionModeKeys) {

src/main/java/org/olat/course/nodes/iq/_i18n/LocalStrings_de.properties

@@ -25,6 +25,7 @@ condition.accessibility.title=Zugang
 correction.auto=Auto
 correction.manual=Manuell
 correction.mode=Korrektur
+correction.mode.help=Bei einer Auto Korrektur wird das Resultat sofort angezeigt. Bei der Manuell Korrektur muss die Sichtbarkeit im Bewertungswerkzeug gendert werden. Fr die Fragetypen Freitext, Zeichnen und Datei hochladen ist Manuell Korrektur zwingend.
 correcttest=Test korrigieren
 coursefolder=Ablageordner Kurs "{0}"
 digital.signature=Testquittung erstellen

src/main/java/org/olat/course/nodes/iq/_i18n/LocalStrings_en.properties

@@ -25,6 +25,7 @@ condition.accessibility.title=Access
 correction.auto=Auto
 correction.manual=Manual
 correction.mode=Correction
+correction.mode.help=For Auto correction the result is shown immediately. For Manual correction the visibility need to be changed in the assessment tool. For the question types essay, drawing and file upload a manual correction is mandatory.
 correcttest=Correct test
 coursefolder=Storage folder of course "{0}"
 digital.signature=Test receipt

src/main/java/org/olat/ims/qti21/pool/QTI12To21Converter.java

@@ -741,7 +741,6 @@ public class QTI12To21Converter {
 				text = StringEscapeUtils.unescapeHtml(text);
 			}
 		}
-		System.out.println(text);
 		return text;
 	}