Merge branch 'master' of ssh://srosse@office.frentix.com/home/srosse/repositories/OpenOLAT.git

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

@@ -110,7 +110,7 @@ qti.form.date.start.error.mandatory=Es muss mindestens ein Anfangsdatum angegebe
 qti.form.enablecancel=Abbrechen erlauben
 qti.form.enablesuspend=Unterbrechen erlauben
 qti.form.fullwindow=Nur Modul anzeigen, LMS ausblenden
-qti.form.limit.attempts=Anzahl L\u00F6sungsversuche limitieren
+qti.form.limit.attempts=Anzahl L\u00F6sungsversuche des Tests limitieren
 qti.form.max.score.item=Max. Punkte der Frage anzeigen
 qti.form.menudisplay=Menu-Navigation anzeigen
 qti.form.menuenable=Menu-Navigation erlauben

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

@@ -110,7 +110,7 @@ qti.form.date.start.error.mandatory=At least a starting date must be indicated.
 qti.form.enablecancel=Allow to cancel
 qti.form.enablesuspend=Allow to suspend
 qti.form.fullwindow=Display only module, hide LMS
-qti.form.limit.attempts=Limit the number of attempts
+qti.form.limit.attempts=Limit number of test attempts
 qti.form.max.score.item=Show questions max. points
 qti.form.menudisplay=Show menu navigation 
 qti.form.menuenable=Allow menu navigation 

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

@@ -110,7 +110,7 @@ qti.form.date.start.error.mandatory=Il faut indiquer au moins une date de d\u00E
 qti.form.enablecancel=Permettre abandon
 qti.form.enablesuspend=Permettre interruption
 qti.form.fullwindow=Afficher le module seul, masquer le LMS
-qti.form.limit.attempts=Limiter le nombre de tentatives
+qti.form.limit.attempts=Limiter le nombre de tentatives de test
 qti.form.max.score.item=Montrer le nombre de points maximum
 qti.form.menudisplay=Afficher navigation Menu 
 qti.form.menuenable=Autoriser navigation Menu

src/main/java/org/olat/modules/portfolio/ui/AbstractPageListController.java

@@ -737,7 +737,7 @@ implements Activateable2, TooledController, FlexiTableComponentDelegate {
 		timelineSwitchOffButton.setVisible(false);
 		flc.contextPut("timelineSwitch", Boolean.TRUE);
 		if(savePreferences) {
-			ureq.getUserSession().getGuiPreferences().put(this.getClass(), getTimelineSwitchPreferencesName(), "on");
+			ureq.getUserSession().getGuiPreferences().putAndSave(this.getClass(), getTimelineSwitchPreferencesName(), "on");
 		}
 	}
 	
@@ -746,7 +746,7 @@ implements Activateable2, TooledController, FlexiTableComponentDelegate {
 		timelineSwitchOffButton.setVisible(true);
 		flc.contextPut("timelineSwitch", Boolean.FALSE);
 		if(savePreferences) {
-			ureq.getUserSession().getGuiPreferences().put(this.getClass(), getTimelineSwitchPreferencesName(), "off");
+			ureq.getUserSession().getGuiPreferences().putAndSave(this.getClass(), getTimelineSwitchPreferencesName(), "off");
 		}
 	}