diff --git a/src/main/java/org/olat/core/commons/modules/bc/_content/file_upload.html b/src/main/java/org/olat/core/commons/modules/bc/_content/file_upload.html
index e0a5cf89b4f27683007a3ef25f86d7fc84553294..a8637e61347b0f66071a6ee0d35a9823088b2fc3 100644
--- a/src/main/java/org/olat/core/commons/modules/bc/_content/file_upload.html
+++ b/src/main/java/org/olat/core/commons/modules/bc/_content/file_upload.html
@@ -1,10 +1,10 @@
 <div class="container-fluid">
 ## for odd reason bootstrap calls vertical horizontal
 <fieldset #if(!$!f.domReplacementWrapperRequired) id="$r.getCId()" #end class="o_form form-horizontal #if ($off_css_class) $off_css_class #end $f.getContainerCssClass()" role="form">
-#if ($off_title || $off_chelp_package) 
+#if ($off_title) 
 	<legend>
-		#if ($off_chelp_package) 
-			$r.contextHelpWithWrapper("$off_chelp_package","$off_chelp_page","$off_chelp_hover") 
+		#if ($off_chelp_url) 
+			$r.contextHelpWithWrapper("$off_chelp_url") 
 		#end
 		$!off_title
 	</legend> 
diff --git a/src/main/java/org/olat/core/gui/Windows.java b/src/main/java/org/olat/core/gui/Windows.java
index b3a082922bffa432f79cbe5f0744472264ee6e2a..43d1eab02fa6ae69cfd0763a5d6acabcbe06c8eb 100644
--- a/src/main/java/org/olat/core/gui/Windows.java
+++ b/src/main/java/org/olat/core/gui/Windows.java
@@ -55,7 +55,6 @@ public class Windows implements Disposable, Serializable {
 	private final AtomicInteger assessmentStarted = new AtomicInteger();
 	private transient WindowManager windowManagerImpl;
 	private transient ChiefController chiefController;
-	private transient ChiefController contextHelpChiefController;
 
 	private transient SlowBandWidthSimulator sbws;
 	
@@ -210,22 +209,11 @@ public class Windows implements Disposable, Serializable {
 		this.chiefController = chiefController;
 	}
 
-	public ChiefController getContextHelpChiefController() {
-		return contextHelpChiefController;
-	}
-
-	public void setContextHelpChiefController(ChiefController contextHelpChiefController) {
-		this.contextHelpChiefController = contextHelpChiefController;
-	}
-
 	@Override
 	public void dispose() {
 		if(chiefController != null) {
 			chiefController.dispose();
 		}
-		if(contextHelpChiefController != null) {
-			contextHelpChiefController.dispose();
-		}
 		if(windowManagerImpl != null) {
 			windowManagerImpl.dispose();
 		}
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/FormBasicController.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/FormBasicController.java
index 552784937efdd44c7d846175b95affdd6a665fbe..a6d562850bb3cac7a15fc5e6f2f860038e313994 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/FormBasicController.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/FormBasicController.java
@@ -552,25 +552,6 @@ public abstract class FormBasicController extends BasicController {
 		}
 	}
 	
-	/**
-	 * Set an optional context help link for this form. If you use a custom
-	 * template this will have no effect
-	 * 
-	 * @param packageName The bundle name, e.g. org.olat.core
-	 * @param pageName The page name, e.g. my-helppage.html
-	 * @param hoverTextKey The hover text to indicate what this help is about
-	 *          (i18nkey)
-	 */
-	protected void setFormContextHelp(String packageName, String pageName, String hoverTextKey) {
-		if (packageName == null) {
-			flc.contextRemove("off_chelp_package");
-		} else {
-			flc.contextPut("off_chelp_package", packageName);
-			flc.contextPut("off_chelp_page", pageName);
-			flc.contextPut("off_chelp_hover", hoverTextKey);
-		}
-	}
-	
 	protected void setFormContextHelp(String url) {
 		if (url == null) {
 			flc.contextRemove("off_chelp_url");
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/FormLayoutContainer.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/FormLayoutContainer.java
index 690686952018f313238ee6e3d43ac66ef7a3d37f..416d95f49a60558c1ba7f68305250778c2a51e9c 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/FormLayoutContainer.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/FormLayoutContainer.java
@@ -431,25 +431,6 @@ public class FormLayoutContainer extends FormItemImpl implements FormItemContain
 		formLayoutContainer.contextPut("off_desc", description);
 	}
 	
-	/**
-	 * Set an optional context help link for this form. If you use a custom
-	 * template this will have no effect
-	 * 
-	 * @param packageName The bundle name, e.g. org.olat.core
-	 * @param pageName The page name, e.g. my-helppage.html
-	 * @param hoverTextKey The hover text to indicate what this help is about
-	 *          (i18nkey)
-	 */
-	public void setFormContextHelp(String packageName, String pageName, String hoverTextKey) {
-		if (packageName == null) {
-			formLayoutContainer.contextRemove("off_chelp_package");
-		} else {
-			formLayoutContainer.contextPut("off_chelp_package", packageName);
-			formLayoutContainer.contextPut("off_chelp_page", pageName);
-			formLayoutContainer.contextPut("off_chelp_hover", hoverTextKey);
-		}
-	}
-	
 	/**
 	 * Set an optional context help link for this form. If you use a custom
 	 * template this will have no effect
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/_content/form_default.html b/src/main/java/org/olat/core/gui/components/form/flexible/impl/_content/form_default.html
index 2b7a3690cccbc44ba574fb20b60bcdcf55ede2e2..33238a66159a1f62b4196a890b440b16eb823191 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/_content/form_default.html
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/_content/form_default.html
@@ -1,27 +1,15 @@
 ## for odd reason bootstrap calls vertial horizontal
 <fieldset #if(!$!f.domReplacementWrapperRequired) id="$r.getCId()" #end class="o_form form-horizontal #if ($off_css_class) $off_css_class #end $f.getContainerCssClass()" role="form">
-#if ($off_title && ($off_chelp_package || $off_chelp_url)) 
+#if ($off_title) 
 	<legend>		
-		#if ($off_chelp_package) 
-			$r.contextHelpWithWrapper("$off_chelp_package","$off_chelp_page","$off_chelp_hover") 
-		#elseif ($off_chelp_url) 
+		#if ($off_chelp_url) 
 			$r.contextHelpWithWrapper("$off_chelp_url")
-		#end
-		
-		#if ($off_icon)
-			<i class="$off_icon"> </i>
-		#end
-		$!off_title
-	</legend> 
-#elseif ($off_title) 
-	<legend>	
+		#end		
 		#if ($off_icon)
 			<i class="$off_icon"> </i>
 		#end
 		$!off_title
 	</legend> 
-#elseif ($off_chelp_package) 
-	<div class="clearfix">$r.contextHelpWithWrapper("$off_chelp_package","$off_chelp_page","$off_chelp_hover")</div>
 #elseif ($off_chelp_url) 
 	<div class="clearfix">$r.contextHelpWithWrapper("$off_chelp_url")</div>
 #end
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/_content/form_default_6_6.html b/src/main/java/org/olat/core/gui/components/form/flexible/impl/_content/form_default_6_6.html
index 3f757e924b344b244be05512a999827bb30bb1de..554ca90231fcbeb3ea72d1121d44fccdd4d1aab2 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/_content/form_default_6_6.html
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/_content/form_default_6_6.html
@@ -1,10 +1,8 @@
 ## for odd reason bootstrap calls vertial horizontal
 <fieldset #if(!$!f.domReplacementWrapperRequired) id="$r.getCId()" #end class="o_form form-horizontal #if ($off_css_class) $off_css_class #end $f.getContainerCssClass()" role="form">
-#if ($off_title && ($off_chelp_package || $off_chelp_url)) 
+#if ($off_title) 
 	<legend>		
-		#if ($off_chelp_package) 
-			$r.contextHelpWithWrapper("$off_chelp_package","$off_chelp_page","$off_chelp_hover") 
-		#elseif ($off_chelp_url) 
+		#if ($off_chelp_url) 
 			$r.contextHelpWithWrapper("$off_chelp_url") 
 		#end
 		#if ($off_icon)
@@ -12,15 +10,6 @@
 		#end
 		$!off_title
 	</legend> 
-#elseif ($off_title) 
-	<legend>	
-		#if ($off_icon)
-			<i class="$off_icon"> </i>
-		#end
-		$!off_title
-	</legend> 
-#elseif ($off_chelp_package) 
-	<div class="clearfix">$r.contextHelpWithWrapper("$off_chelp_package","$off_chelp_page","$off_chelp_hover")</div>
 #elseif ($off_chelp_url) 
 	<div class="clearfix">$r.contextHelpWithWrapper("$off_chelp_url")</div>
 #end
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/_content/form_default_9_3.html b/src/main/java/org/olat/core/gui/components/form/flexible/impl/_content/form_default_9_3.html
index af984fd500f6eb7b8ccf3ae552eb2c43814310cb..01b98428400032fa6109515d3b8b218e1aa005c4 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/_content/form_default_9_3.html
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/_content/form_default_9_3.html
@@ -1,10 +1,8 @@
 ## for odd reason bootstrap calls vertial horizontal
 <fieldset #if(!$!f.domReplacementWrapperRequired) id="$r.getCId()" #end class="o_form form-horizontal #if ($off_css_class) $off_css_class #end $f.getContainerCssClass()" role="form">
-#if ($off_title && ($off_chelp_package || $off_chelp_url)) 
+#if ($off_title) 
 	<legend>		
-		#if ($off_chelp_package) 
-			$r.contextHelpWithWrapper("$off_chelp_package","$off_chelp_page","$off_chelp_hover") 
-		#elseif ($off_chelp_url) 
+		#if ($off_chelp_url) 
 			$r.contextHelpWithWrapper("$off_chelp_url") 
 		#end
 		#if ($off_icon)
@@ -12,15 +10,6 @@
 		#end
 		$!off_title
 	</legend> 
-#elseif ($off_title) 
-	<legend>	
-		#if ($off_icon)
-			<i class="$off_icon"> </i>
-		#end
-		$!off_title
-	</legend> 
-#elseif ($off_chelp_package) 
-	<div class="clearfix">$r.contextHelpWithWrapper("$off_chelp_package","$off_chelp_page","$off_chelp_hover")</div>
 #elseif ($off_chelp_url) 
 	<div class="clearfix">$r.contextHelpWithWrapper("$off_chelp_url")</div>
 #end
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/_content/form_horizontal.html b/src/main/java/org/olat/core/gui/components/form/flexible/impl/_content/form_horizontal.html
index e11813bd2081793902789c66ec03e5b8c46871b6..4db285ce4eafdf02467f61cd4148db4aee770143 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/_content/form_horizontal.html
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/_content/form_horizontal.html
@@ -1,10 +1,8 @@
 ## for odd reason bootstrap calls horizontal inline...
 <fieldset #if(!$!f.domReplacementWrapperRequired) id="$r.getCId()" #end class="o_form form-inline #if ($off_css_class) $off_css_class #end $f.getContainerCssClass()" role="form">
-#if ($off_title || $off_chelp_package || $off_chelp_url) 
+#if ($off_title) 
 	<legend>
-	#if ($off_chelp_package) 
-		$r.contextHelpWithWrapper("$off_chelp_package","$off_chelp_page","$off_chelp_hover") 
-	#elseif ($off_chelp_url) 
+	#if ($off_chelp_url) 
 		$r.contextHelpWithWrapper("$off_chelp_url") 
 	#end
 	#if ($off_icon)
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/_content/form_panel.html b/src/main/java/org/olat/core/gui/components/form/flexible/impl/_content/form_panel.html
index ef3b1b1f6ccf4d9b7b98602b99c230c61247c6ba..cc8d249e6e5962e39f27cb94cce09122e2fe9b3c 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/_content/form_panel.html
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/_content/form_panel.html
@@ -1,9 +1,7 @@
 <div #if(!$!f.domReplacementWrapperRequired) id="$r.getCId()" #end class="panel #if($off_warn) panel-warning #elseif($off_info) panel-info #else panel-default #end #if ($off_css_class) $off_css_class #end $f.getContainerCssClass()">
-#if ($off_title || $off_chelp_package || $off_chelp_url || $off_icon) 
+#if ($off_title || $off_chelp_url || $off_icon) 
 	<div class="panel-heading">	
-		#if ($off_chelp_package) 
-			$r.contextHelpWithWrapper("$off_chelp_package","$off_chelp_page","$off_chelp_hover") 
-		#elseif ($off_chelp_url) 
+		#if ($off_chelp_url) 
 			$r.contextHelpWithWrapper("$off_chelp_url") 
 		#end
 		#if ($off_icon)
@@ -18,7 +16,7 @@
 		#if ($off_desc) <p>$off_desc</p> #end
 		#if ($off_warn) <p>$off_warn</p> #end
 		#if ($off_info) <p>$off_info</p> #end
-	</div></div>
+	</div>
 #end
 
 <table class="table table-condensed">
@@ -35,19 +33,18 @@
 			#if($f.hasError($item))
 				<span class="o_icon o_icon_error form-control-feedback"></span>
 			#end
-		</div>
-		#if($f.hasExample($item))
-			<div class="o_form_example help-block">
-				$r.render("${item}_EXAMPLE")
-			</div>
-		#end
-		#if($f.hasError($item))
-			<div class="">
-				$r.render("${item}_ERROR")
-			</div>
-		#end
+			#if($f.hasExample($item))
+				<div class="o_form_example help-block">
+					$r.render("${item}_EXAMPLE")
+				</div>
+			#end
+			#if($f.hasError($item))
+				<div class="">
+					$r.render("${item}_ERROR")
+				</div>
+			#end
 		</td>
-	</div>
+	</tr>
 	#end
 #end
 	</tbody>
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/_content/form_vertical.html b/src/main/java/org/olat/core/gui/components/form/flexible/impl/_content/form_vertical.html
index 67d534ac447a35f7f9abb2a35ad1195dfe19bb6d..e721d73760f5e4cb353cb09f01477ad35634075b 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/_content/form_vertical.html
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/_content/form_vertical.html
@@ -1,25 +1,14 @@
 <fieldset #if(!$!f.domReplacementWrapperRequired) id="$r.getCId()" #end class="o_form form #if ($off_css_class) $off_css_class #end $f.getContainerCssClass()" role="form">
-#if ($off_title && ($off_chelp_package || $off_chelp_url)) 
+#if ($off_title) 
 	<legend>		
-		#if($off_chelp_package) 
-			$r.contextHelpWithWrapper("$off_chelp_package","$off_chelp_page","$off_chelp_hover") 
-		#elseif($off_chelp_url) 
-			$r.contextHelpWithWrapper("$off_chelp_url","$off_chelp_page","$off_chelp_hover") 
+		#if($off_chelp_url) 
+			$r.contextHelpWithWrapper("$off_chelp_url") 
 		#end
 		#if ($off_icon)
 			<i class="$off_icon"> </i>
 		#end
 		$!off_title
 	</legend> 
-#elseif ($off_title) 
-	<legend>	
-		#if ($off_icon)
-			<i class="$off_icon"> </i>
-		#end
-		$!off_title
-	</legend> 
-#elseif ($off_chelp_package) 
-	<div class="clearfix">$r.contextHelpWithWrapper("$off_chelp_package","$off_chelp_page","$off_chelp_hover")</div>
 #elseif ($off_chelp_url) 
 	<div class="clearfix">$r.contextHelpWithWrapper("$off_chelp_url")</div>
 #end
diff --git a/src/main/java/org/olat/core/gui/control/_spring/fullWebAppContext.xml b/src/main/java/org/olat/core/gui/control/_spring/fullWebAppContext.xml
index 5b76b421fead582d2b70a8282bd6b095c3041c4f..d5aee96e0cc6c0c773a772d78d2419315581ac9c 100644
--- a/src/main/java/org/olat/core/gui/control/_spring/fullWebAppContext.xml
+++ b/src/main/java/org/olat/core/gui/control/_spring/fullWebAppContext.xml
@@ -66,30 +66,4 @@
 		<property name="className" value="org.olat.gui.control.OlatMinimalTopNavController"/>
 	</bean>
 
-	<!--
-		******************************************
-		*** Configure the controller in the    ***
-		*** header part, in context help       ***
-		******************************************
-	-->
-	<bean id="fullWebApp.ContextHelpHeaderControllerCreator" class="org.olat.core.gui.control.creator.AutoCreator"/> 		
-	<!--
-		******************************************
-		*** Configure the controller in the    ***
-		*** right upper corner inin context help**
-		******************************************
-	-->
-	<bean id="fullWebApp.ContextHelpTopNavControllerCreator" class="org.olat.core.gui.control.creator.AutoCreator">
-		<property name="className" value="org.olat.core.commons.contextHelp.ContextHelpTopNavController" />
-	</bean>
-	<!--
-		******************************************
-		*** Configure the controller in the    ***
-		*** Footer in in context help.         ***
-		******************************************
-	-->
-	<bean id="fullWebApp.ContextHelpFooterControllerCreator" class="org.olat.core.gui.control.creator.AutoCreator" >
-		<property name="className" value="org.olat.gui.control.OlatFooterController"/>
-	</bean>
-
 </beans>
diff --git a/src/main/java/org/olat/core/gui/control/generic/iframe/DeliveryOptionsConfigurationController.java b/src/main/java/org/olat/core/gui/control/generic/iframe/DeliveryOptionsConfigurationController.java
index d9f0cddda42676a98bf46834e474a6e571ed82b4..5d1e314d569970347e8025ff0d20c096b380187c 100644
--- a/src/main/java/org/olat/core/gui/control/generic/iframe/DeliveryOptionsConfigurationController.java
+++ b/src/main/java/org/olat/core/gui/control/generic/iframe/DeliveryOptionsConfigurationController.java
@@ -35,6 +35,7 @@ import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer;
 import org.olat.core.gui.control.Controller;
 import org.olat.core.gui.control.Event;
 import org.olat.core.gui.control.WindowControl;
+import org.olat.core.util.StringHelper;
 import org.olat.course.editor.NodeEditController;
 
 /**
@@ -145,7 +146,7 @@ public class DeliveryOptionsConfigurationController extends FormBasicController
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		setFormTitle("option.desc");
-		if(helpPage != null || helpPage != ""){
+		if(StringHelper.containsNonWhitespace(helpPage)){
 			setFormContextHelp(helpPage);
 		}
 
diff --git a/src/main/java/org/olat/core/gui/control/generic/modal/DialogBoxController.java b/src/main/java/org/olat/core/gui/control/generic/modal/DialogBoxController.java
index e504eabf4f0e6e2408cd28a2c2daab8624bf8f9f..3d0392b15d3cf49cd501566d81494f9dfa2f0ddf 100644
--- a/src/main/java/org/olat/core/gui/control/generic/modal/DialogBoxController.java
+++ b/src/main/java/org/olat/core/gui/control/generic/modal/DialogBoxController.java
@@ -57,7 +57,6 @@ import org.olat.core.gui.control.Event;
 import org.olat.core.gui.control.WindowControl;
 import org.olat.core.gui.control.controller.BasicController;
 import org.olat.core.util.StringHelper;
-import org.olat.core.util.Util;
 
 /**
  * <h3>Description:</h3>
@@ -131,19 +130,17 @@ public class DialogBoxController extends BasicController {
 		}
 	}
 	
-	public void setContextHelp(String pageName) {
-		setContextHelp(null, pageName, null);
-	}
-	
-	public void setContextHelp(String packageName, String pageName, String hoverTextKey) {
-		if (packageName == null) {
-			dialogBoxVC.contextRemove("off_chelp_package");
+	/**
+	 * Set an optional context help link for this form. If you use a custom
+	 * template this will have no effect
+	 * 
+	 * @param url The page in confluence 
+	 */
+	public void setContextHelp(String url) {
+		if (url == null) {
+			dialogBoxVC.contextRemove("off_chelp_url");
 		} else {
-			setTranslator(Util.createPackageTranslator(packageName, getLocale(), getTranslator()));
-			dialogBoxVC.contextPut("off_chelp_package", packageName);
-			dialogBoxVC.contextPut("off_chelp_page", pageName);
-			dialogBoxVC.contextPut("off_chelp_hover", hoverTextKey);
-			dialogBoxVC.setTranslator(getTranslator());
+			dialogBoxVC.contextPut("off_chelp_url", url);
 		}
 	}
 
diff --git a/src/main/java/org/olat/core/gui/control/generic/modal/_content/dialogbox.html b/src/main/java/org/olat/core/gui/control/generic/modal/_content/dialogbox.html
index 9a815b7f52adef03686626a2765422a3a7471e98..18013e50c119549e92f2057e708c8a50a848405e 100644
--- a/src/main/java/org/olat/core/gui/control/generic/modal/_content/dialogbox.html
+++ b/src/main/java/org/olat/core/gui/control/generic/modal/_content/dialogbox.html
@@ -8,7 +8,7 @@
 		#end
 	</div>
 	<div class="modal-body">
-		#if ($off_chelp_package) $r.contextHelpWithWrapper("$off_chelp_package","$off_chelp_page","$off_chelp_hover") #end
+		#if ($off_chelp_url) $r.contextHelpWithWrapper("$off_chelp_url") #end
 		<p>$text</p>
 	</div>
 	<div class="modal-footer">
diff --git a/src/main/java/org/olat/core/gui/control/generic/wizard/StepsMainRunController.java b/src/main/java/org/olat/core/gui/control/generic/wizard/StepsMainRunController.java
index e97e87ffcb1b71f521c9a59f7e2d8df6b7dd7644..ad159fe9d9890248534786dc884d39bd1891f6c6 100644
--- a/src/main/java/org/olat/core/gui/control/generic/wizard/StepsMainRunController.java
+++ b/src/main/java/org/olat/core/gui/control/generic/wizard/StepsMainRunController.java
@@ -43,6 +43,7 @@ import org.olat.core.gui.control.Event;
 import org.olat.core.gui.control.WindowControl;
 import org.olat.core.gui.control.creator.ControllerCreator;
 import org.olat.core.logging.AssertException;
+import org.olat.core.util.StringHelper;
 import org.olat.core.util.event.GenericEventListener;
 
 /**
@@ -147,7 +148,9 @@ public class StepsMainRunController extends FormBasicController implements Gener
 		this.cancel = cancel;
 		flc.contextPut("wizardTitle", wizardTitle);
 		flc.contextPut("elementCssClass", elementCssClass);
-		flc.contextPut("helpPage", contextHelpPage);
+		if (StringHelper.containsNonWhitespace(contextHelpPage)) {
+			flc.contextPut("helpPage", contextHelpPage);			
+		}
 
 		this.startStep = startStep;
 		steps = new Stack<Step>();
diff --git a/src/main/java/org/olat/core/gui/control/generic/wizard/_content/stepslayout.html b/src/main/java/org/olat/core/gui/control/generic/wizard/_content/stepslayout.html
index 76479c33a24f0a2d37127013830db3182c248b7c..883e32f9d287461d547bd253aebb10a71803a66b 100644
--- a/src/main/java/org/olat/core/gui/control/generic/wizard/_content/stepslayout.html
+++ b/src/main/java/org/olat/core/gui/control/generic/wizard/_content/stepslayout.html
@@ -1,7 +1,7 @@
 <div class="o_wizard modal show in"><div class="modal-backdrop in"></div><div class="modal-dialog modal-lg o_modal_fullwidth #if($elementCssClass) $elementCssClass #end"><div class="modal-content">
 	<div class="modal-header">
 		<div class="pull-right">$r.render("closeIcon")</div>
-		#if( "$helpPage" != "")
+		#if($helpPage)
 			$r.contextHelpWithWrapper("$helpPage")
 		#end
 		<h4>$wizardTitle</h4>
diff --git a/src/main/java/org/olat/core/gui/render/velocity/VelocityRenderDecorator.java b/src/main/java/org/olat/core/gui/render/velocity/VelocityRenderDecorator.java
index e6038dd77727a343df48d99e5108807b23328f03..f7dd879ce081cb0b72a3ff57def29c40ac5e2715 100644
--- a/src/main/java/org/olat/core/gui/render/velocity/VelocityRenderDecorator.java
+++ b/src/main/java/org/olat/core/gui/render/velocity/VelocityRenderDecorator.java
@@ -65,7 +65,6 @@ import org.olat.core.util.i18n.I18nModule;
  */
 public class VelocityRenderDecorator implements Closeable {
 	
-	public static final String PARAM_CHELP_BUNDLE = "chelpbundle";
 	private VelocityContainer vc;
 	private Renderer renderer;
 	private final boolean isIframePostEnabled;
diff --git a/src/main/java/org/olat/course/_spring/courseContext.xml b/src/main/java/org/olat/course/_spring/courseContext.xml
index 79374ec14f28ebc24e9348984041673a4e35a59f..49cc550b8963035c53440f3993a793ba6b9e128e 100644
--- a/src/main/java/org/olat/course/_spring/courseContext.xml
+++ b/src/main/java/org/olat/course/_spring/courseContext.xml
@@ -130,10 +130,9 @@
 		<property name="version" value="8.1" />
 		<property name="redeploy" value="true" />
 		<!-- 
-			Url to the course which should be used as help course. The specified course will be used 
-			in all languages.
-			To disable the help course feature, leave the helpCourseFile configuration empty.
-			Have also a look at the ContextHelpModule configuration.
+			Url to the course which should be used as help course when help.plugin is set to 'courseHelp'. 
+			The is the legacy help system, it is not recommended to use this anymore. Context help will not
+			be available in this configuration, this is now in the confluence manual.
 		--> 
 	</bean>
 	
diff --git a/src/main/java/org/olat/course/nodes/ta/ModulesForm.java b/src/main/java/org/olat/course/nodes/ta/ModulesForm.java
index 20d527afcfac1fd69562df68a8a4876231bf82f8..eadd72fee24a5e84d7568194cc8450942a17f077 100644
--- a/src/main/java/org/olat/course/nodes/ta/ModulesForm.java
+++ b/src/main/java/org/olat/course/nodes/ta/ModulesForm.java
@@ -82,7 +82,7 @@ public class ModulesForm extends FormBasicController {
 		    scoring.isSelected(0) ||
 		    solution.isSelected(0)) return true;
 		
-		setFormInfo("chelp.sel2");
+		setFormInfo("atleastone");
 		cb.select("xx", true);
 		return false;
 	}
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_ar.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_ar.properties
index bb5d1b585f9376c2f260e1cf0a84962d96d7469a..2a323514ef3cbe72f452a48d8a43ebfd9bf956a7 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_ar.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_ar.properties
@@ -1,4 +1,5 @@
-#Wed Apr 07 11:06:16 CEST 2010
+#Wed Nov 04 23:38:15 CET 2015
+atleastone=\u064A\u062C\u0628 \u062A\u062D\u062F\u064A\u062F \u0639\u0646\u0635\u0631 \u0641\u0631\u0639\u0649 \u0648\u0627\u062D\u062F \u0639\u0644\u0649 \u0627\u0644\u0623\u0642\u0644.
 chelp.ass1=\u0639\u0644\u0649 \u0627\u0644\u0645\u0634\u0627\u0631\u0643\u064A\u0646 \u0641\u0649 \u0627\u0644\u0645\u0642\u0631\u0631 \u0627\u0644\u062E\u0627\u0635 \u0628\u0643. $\:chelp.taskfolder \u0647\u0646\u0627 \u064A\u0645\u0643\u0646\u0643 \u062A\u062D\u062F\u064A\u062F \u0627\u0644\u0643\u064A\u0641\u064A\u0629 \u0627\u0644\u062A\u0649 \u0633\u064A\u062A\u0645 \u0628\u0647\u0627 \u062A\u0648\u0632\u064A\u0639 \u0645\u0647\u0627\u0645
 chelp.ass2=\u0644\u062F\u064A\u0643 \u0625\u0645\u0643\u0627\u0646\u064A\u0629 \u0625\u0639\u0637\u0627\u0621 \u0627\u0644\u0645\u0633\u062A\u062E\u062F\u0645\u064A\u0646 \u0628\u0639\u0636 \u0627\u0644\u0645\u0639\u0644\u0648\u0645\u0627\u062A.
 chelp.ass3=\u0625\u0645\u0627 \u0623\u0646 \u0627\u0644\u0645\u0633\u062A\u062E\u062F\u0645\u0648\u0646 \u0642\u0627\u062F\u0631\u064A\u0646 \u0639\u0644\u0649 \u0631\u0624\u064A\u0629 \u0627\u0644\u0645\u0647\u0627\u0645 \u0627\u0644\u062A\u0649 \u0642\u0645\u062A \u0628\u0625\u0633\u0646\u0627\u062F\u0647\u0627 \u0644\u0647\u0645 \u0645\u0646 \u0623\u062C\u0644 \u0627\u062E\u062A\u064A\u0627\u0631 \u0648\u0627\u062D\u062F\u0629 \u0645\u0646\u0647\u0627 \u0623\u0648 \u0623\u0646 \u0627\u0644\u0645\u0647\u0645\u0629 \u0633\u064A\u062A\u0645 \u0625\u0633\u0646\u0627\u062F\u0647\u0627 \u0644\u0647\u0645 \u062A\u0644\u0642\u0627\u0626\u064A\u0627\u064B.
@@ -20,7 +21,6 @@ chelp.prevFalse=<i>\u00AB$\:form.task.without.preview\u00BB</i>
 chelp.prevTrue=<i>\u00AB$\:form.task.with.preview\u00BB</i>
 chelp.scoring=<b>$\:pane.tab.conf.scoring</b>
 chelp.sel1=\u064A\u0646\u0628\u063A\u0649 $org.olat.course.nodes\:title_ta \u0644\u0639\u0646\u0635\u0631 \u0627\u0644\u0645\u0642\u0631\u0631 $\:chelp.task, $\:chelp.dropbox, $\:chelp.scoring \u064A\u0645\u0643\u0646\u0643 \u0647\u0646\u0627 \u062A\u062D\u062F\u064A\u062F \u0623\u0649 \u0627\u0644\u0639\u0646\u0627\u0635\u0631 \u0627\u0644\u0641\u0631\u0639\u064A\u0629\r\n\u0623\u0646 \u064A\u062A\u0645 \u0627\u0633\u062A\u062E\u062F\u0627\u0645\u0647\u0627\u060C \u0648\u0625\u0630\u0627 \u0644\u0645 \u062A\u0642\u0645 \u0628\u0625\u062C\u0631\u0627\u0621 \u0623\u064A\u0629 \u062A\u0639\u062F\u064A\u0644\u0627\u062A \u0641\u0625\u0646 \u0643\u0644 \u0627\u0644\u0639\u0646\u0627\u0635\u0631 \u0627\u0644\u0641\u0631\u0639\u064A\u0629 \u0633\u062A\u0643\u0648\u0646 \u0646\u0634\u0637\u0629\u060C \u0648\u0625\u0630\u0627 \u0642\u0645\u062A \u0628\u0625\u0644\u063A\u0627\u0621 \u0627\u062E\u062A\u064A\u0627\u0631 \u0648\u0627\u062D\u062F\u0629 \u0623\u0648 \u0623\u0643\u062B\u0631 \u0645\u0646 \u0627\u0644\u0639\u0646\u0627\u0635\u0631 \u0627\u0644\u0641\u0631\u0639\u064A\u0629 \u0641\u0625\u0646 \u0645\u0641\u0627\u062A\u064A\u062D \u0627\u0644\u062A\u0628\u0648\u064A\u0628 \u0630\u0627\u062A \u0627\u0644\u0635\u0644\u0629 \u0644\u0646 \u064A\u0645\u0643\u0646 \u0627\u062E\u062A\u064A\u0627\u0631\u0647\u0627 \u0648\u0633\u062A\u0643\u0648\u0646 \u063A\u064A\u0631 \u0646\u0634\u0637\u0629.
-chelp.sel2=\u064A\u062C\u0628 \u062A\u062D\u062F\u064A\u062F \u0639\u0646\u0635\u0631 \u0641\u0631\u0639\u0649 \u0648\u0627\u062D\u062F \u0639\u0644\u0649 \u0627\u0644\u0623\u0642\u0644.
 chelp.sol1=$\:chelp.linkSol \u064A\u0645\u0643\u0646\u0643 \u0647\u0646\u0627 \u062A\u0632\u0648\u064A\u062F \u0627\u0644\u0645\u0634\u0627\u0631\u0643\u064A\u0646 \u0628\u0627\u0644\u0645\u0642\u0631\u0631 \u0627\u0644\u062E\u0627\u0635 \u0628\u0643 \u0628\u0646\u0645\u0648\u0630\u062C \u0644\u0644\u0625\u062C\u0627\u0628\u0627\u062A \u0641\u0649
 chelp.solution=<b>$\:pane.tab.solution</b>
 chelp.task=<b>$\:pane.tab.conf.task</b>
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_bg.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_bg.properties
index f11dd56ae9c3380b43f87826a59da769c7c93570..d62a720df5367b27390c47544c50220d8bfde8e5 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_bg.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_bg.properties
@@ -1,4 +1,5 @@
-#Fri Aug 28 04:23:52 CEST 2009
+#Wed Nov 04 23:38:15 CET 2015
+atleastone=\u0422\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0438\u0437\u0431\u0435\u0440\u0435\u0442\u0435 \u043F\u043E\u043D\u0435 \u0435\u0434\u0438\u043D \u043F\u043E\u0434-\u0435\u043B\u0435\u043C\u0435\u043D\u0442.
 chelp.ass1=\u0422\u0443\u043A \u043C\u043E\u0436\u0435\u0442\u0435 \u0434\u0430 \u043E\u043F\u0440\u0435\u0434\u0435\u043B\u0438\u0442\u0435 \u043A\u0430\u043A \u0437\u0430\u0434\u0430\u0447\u0438\u0442\u0435 \u043E\u0442 <i>\u041E\u0442\u0432\u043E\u0440\u0435\u0442\u0435 \u043F\u0430\u043F\u043A\u0430 \u0441\u044A\u0441 \u0437\u0430\u0434\u0430\u0447\u0438</i> \u0449\u0435 \u0441\u0435 \u0440\u0430\u0437\u043F\u0440\u0435\u0434\u0435\u043B\u044F\u0442 \u043C\u0435\u0436\u0434\u0443 \u043A\u0443\u0440\u0441\u043E\u0432\u0438\u0442\u0435 \u0443\u0447\u0430\u0441\u0442\u043D\u0438\u0446\u0438.
 chelp.ass2=\u0418\u043C\u0430\u0442\u0435 \u0432\u044A\u0437\u043C\u043E\u0436\u043D\u043E\u0441\u0442 \u0434\u0430 \u0434\u0430\u0434\u0435\u0442\u0435 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F \u043D\u0430 \u0432\u0430\u0448\u0438\u0442\u0435 \u043F\u043E\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043B\u0438.
 chelp.ass3=\u0418\u043B\u0438 \u0432\u0430\u0448\u0438\u0442\u0435 \u043F\u043E\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043B\u0438 \u0438\u043C\u0430\u0442 \u0432\u044A\u0437\u043C\u043E\u0436\u043D\u043E\u0441\u0442 \u0434\u0430 \u0432\u0438\u0434\u044F\u0442 \u0437\u0430\u0434\u0430\u0447\u0438\u0442\u0435, \u043A\u043E\u0438\u0442\u043E \u0441\u0442\u0435 \u043F\u043E\u0434\u0433\u043E\u0442\u0432\u0438\u043B\u0438 \u0437\u0430 \u0442\u044F\u0445 \u0438 \u0434\u0430 \u0441\u0438 \u0438\u0437\u0431\u0435\u0440\u0430\u0442 \u0435\u0434\u043D\u0430 , \u0438\u043B\u0438 \u0437\u0430\u0434\u0430\u0447\u0438\u0442\u0435 \u0441\u0435 \u0440\u0430\u0437\u0434\u0430\u0432\u0430\u0442 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E.
@@ -20,7 +21,6 @@ chelp.prevFalse=<i>\u041D\u0435, \u0438\u0437\u0431\u0438\u0440\u0430\u043D\u043
 chelp.prevTrue=<i>\u0414\u0430, \u0437\u0430\u0434\u0430\u0447\u0430\u0442\u0430 \u043C\u043E\u0436\u0435 \u0434\u0430 \u0431\u044A\u0434\u0435 \u043F\u0440\u0435\u0433\u043B\u0435\u0434\u0430\u043D\u0430 \u043F\u0440\u0435\u0434\u0438 \u043D\u0435\u0439\u043D\u043E\u0442\u043E \u0434\u0430\u0432\u0430\u043D\u0435</i>
 chelp.scoring=<b>\u041E\u0446\u0435\u043D\u043A\u0430</b>
 chelp.sel1=\u0422\u0443\u043A \u043C\u043E\u0436\u0435\u0442\u0435 \u0434\u0430 \u043E\u043F\u0440\u0435\u0434\u0435\u043B\u0438\u0442\u0435 \u043A\u043E\u0438 \u043F\u043E\u0434-\u0435\u043B\u0435\u043C\u0435\u043D\u0442\u0438 <i>\u0417\u0430\u0434\u0430\u0447\u0430</i>, <i>\u041F\u0440\u0435\u0434\u0430\u0432\u0430\u043D\u0435</i> \u0438\u043B\u0438 <i>\u041E\u0446\u0435\u043D\u043A\u0430</i> \u043D\u0430 \u043A\u0443\u0440\u0441\u043E\u0432\u0438\u044F \u0435\u043B\u0435\u043C\u0435\u043D\u0442 <i>\u0417\u0430\u0434\u0430\u0447\u0430</i> \u0449\u0435 \u0431\u044A\u0434\u0430\u0442 \u0438\u0437\u043F\u043E\u043B\u0437\u0432\u0430\u043D\u0438. \u0410\u043A\u043E \u043D\u0435 \u043D\u0430\u043F\u0440\u0430\u0432\u0438\u0442\u0435 \u043F\u0440\u043E\u043C\u044F\u043D\u0430, \u0432\u0441\u0438\u0447\u043A\u0438 \u043F\u043E\u0434-\u043A\u0443\u0440\u0441\u043E\u0432\u0438 \u0435\u043B\u0435\u043C\u0435\u043D\u0442\u0438 \u0449\u0435 \u0431\u044A\u0434\u0430\u0442 \u0430\u043A\u0442\u0438\u0432\u043D\u0438. \u0410\u043A\u043E \u043E\u0442\u043C\u0435\u043D\u0438\u0442\u0435 \u0438\u0437\u0431\u0438\u0440\u0430\u043D\u0435\u0442\u043E \u043D\u0430 \u0435\u0434\u0438\u043D \u0438\u043B\u0438 \u0434\u0432\u0430 \u043F\u043E\u0434-\u0435\u043B\u0435\u043C\u0435\u043D\u0442\u0430 \u0438 \u0437\u0430\u043F\u0430\u0437\u0438\u0442\u0435 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430\u0442\u0430, \u0441\u044A\u043E\u0442\u0432\u0435\u0442\u043D\u0438\u0442\u0435 \u0442\u0430\u0431\u043E\u0432\u0435 \u043D\u044F\u043C\u0430 \u0434\u0430 \u043C\u043E\u0433\u0430\u0442 \u043F\u043E\u0432\u0435\u0447\u0435 \u0434\u0430 \u0431\u044A\u0434\u0430\u0442 \u0438\u0437\u0431\u0440\u0430\u043D\u0438 \u0438 \u0441\u0430 \u043D\u0435\u0430\u043A\u0442\u0438\u0432\u043D\u0438.
-chelp.sel2=\u0422\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0438\u0437\u0431\u0435\u0440\u0435\u0442\u0435 \u043F\u043E\u043D\u0435 \u0435\u0434\u0438\u043D \u043F\u043E\u0434-\u0435\u043B\u0435\u043C\u0435\u043D\u0442.
 chelp.sol1=\u0422\u0443\u043A \u043C\u043E\u0436\u0435\u0442\u0435 \u0434\u0430 \u043E\u0441\u0438\u0433\u0443\u0440\u0438\u0442\u0435 \u043F\u0440\u0438\u043C\u0435\u0440\u043D\u0438 \u0440\u0435\u0448\u0435\u043D\u0438\u044F \u0437\u0430 \u0432\u0430\u0448\u0438\u0442\u0435 \u043A\u0443\u0440\u0441\u043E\u0432\u0438 \u0443\u0447\u0430\u0441\u0442\u043D\u0438\u0446\u0438 \u0432 <i>\u041E\u0442\u0432\u043E\u0440\u0435\u0442\u0435 \u043F\u0430\u043F\u043A\u0430 \u0441 \u043F\u0440\u0438\u043C\u0435\u0440\u043D\u0438 \u0440\u0435\u0448\u0435\u043D\u0438\u044F</i>.\t
 chelp.solution=<b>\u041F\u0440\u0438\u043C\u0435\u0440\u043D\u043E \u0440\u0435\u0448\u0435\u043D\u0438\u0435</b>
 chelp.task=<b>\u0417\u0430\u0434\u0430\u0447\u0430</b>
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_cs.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_cs.properties
index 0ee037351f12bbeb957a1ecc8a59009a00691fc3..d479d7609386716e2f1f476964c400ba46eb4fda 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_cs.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_cs.properties
@@ -1,4 +1,5 @@
-#Mon Mar 02 09:54:14 CET 2009
+#Wed Nov 04 23:38:15 CET 2015
+atleastone=Mus\u00EDte vybrat alespo\u0148 jeden podelement.
 chelp.ass1=Zde vol\u00EDte, jak m\u00E1 b\u00FDt \u00FA\u010Dastn\u00EDk\u016F rozesl\u00E1n \u00FAkol z $\:chelp.taskfolder .
 chelp.ass2=M\u00E1te mo\u017Enost poskytnout \u00FA\u010Dastn\u00EDk\u016Fm informace.
 chelp.ass3=Bu\u010F maj\u00ED u\u017Eivatel\u00E9 mo\u017Enost vybrat si z \u00FAkol\u016F, kter\u00E9 jste jim p\u0159id\u011Blili nebo je jim \u00FAkol p\u0159id\u011Blen automaticky.
@@ -20,7 +21,6 @@ chelp.prevFalse=<i>&laquo;$\:form.task.without.preview&raquo;</i>
 chelp.prevTrue=<i>&laquo;$\:form.task.with.preview&raquo;</i>
 chelp.scoring=<b>$\:pane.tab.conf.scoring</b>
 chelp.sel1=Zde m\u016F\u017Eete rozhodnout, kter\u00FD podelement $\:chelp.task , $\:chelp.dropbox nebo $\:chelp.scoring elementu kurzu $\:chelp.taskNode by m\u011Bl b\u00FDt pou\u017Eit. Pokud neprovede zm\u011Bnu v\u0161echny podelementy budou aktivn\u00ED. Pokud odvyberete jenden nebo dva podelementy a nastaven\u00ED ulo\u017E\u00EDte, p\u0159\u00EDslu\u0161n\u00E9 elementy ji\u017E nebudou moci b\u00FDt vybr\u00E1ny, jsou neaktivn\u00ED.
-chelp.sel2=Mus\u00EDte vybrat alespo\u0148 jeden podelement.
 chelp.sol1=Zde m\u016F\u017Eete nab\u00EDdnout uk\u00E1zkov\u00E9 \u0159e\u0161en\u00ED $\:chelp.linkSol .\t
 chelp.solution=<b>$\:pane.tab.solution</b>
 chelp.task=<b>$\:pane.tab.conf.task</b>
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_de.properties
index 2567745f0591eb97ebb2a8322ca13fdf5bee6fbf..a423999408479e231078a3c5b82c71df26d40f3b 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_de.properties
@@ -1,4 +1,5 @@
-#Mon Mar 02 09:54:04 CET 2009
+#Wed Nov 04 23:38:15 CET 2015
+atleastone=Sie m\u00FCssen mindestens einen Teilbaustein w\u00E4hlen.
 bulk.download.title=Alle Abgabeordner herunterladen
 chelp.ass1=Hier bestimmen Sie, wie die Aufgaben im $\:chelp.taskfolder an die Kursteilnehmer verteilt werden.
 chelp.ass2=Sie haben die M\u00F6glichkeit, den Benutzern eine Information anzeigen zu lassen.
@@ -7,11 +8,11 @@ chelp.ass4=bedeutet, dass die Aufgaben im Aufgabenordner beliebig oft zugewiesen
 chelp.ass5=bedeutet, dass jede Aufgabe nur ein einziges Mal gezogen werden kann. D.h. wenn eine Aufgabe schon von einem Kursteilnehmer gezogen wurde, steht sie anderen Kursteilnehmern nicht mehr zur Verf\u00FCgung.
 chelp.ass6=$\:chelp.prevTrue bedeutet, dass die Aufgabe - bevor sie dem Benutzer zugewiesen wird - angeschaut werden kann und sie somit abgelehnt werden kann.
 chelp.ass7=$\:chelp.prevFalse bedeuted, dass der Benutzer die Aufgabe erst anschauen kann, nachdem sie ihm zugewiesen worden ist.
-chelp.ced-ta-assign.title=Aufgabenbaustein: Aufgabe zuweisen
-chelp.ced-ta-conf.title=Abgabe: Bestätigung
+chelp.ced-ta-assign.title=Aufgabenbaustein\: Aufgabe zuweisen
+chelp.ced-ta-conf.title=Abgabe\: Best\u00E4tigung
 chelp.ced-ta-select.title=$\:form.modules.title
-chelp.ced-ta-sol.title=Aufgabenbaustein: Musterlösungen erstellen oder hochladen
-chelp.ced-ta-upl.title=Aufgabenbaustein: Aufgaben erstellen oder hochladen
+chelp.ced-ta-sol.title=Aufgabenbaustein\: Musterl\u00F6sungen erstellen oder hochladen
+chelp.ced-ta-upl.title=Aufgabenbaustein\: Aufgaben erstellen oder hochladen
 chelp.conf1=Sie k\u00F6nnen optional einen Text eingeben, welcher dem Benutzer nach erfolgreicher Abgabe der Datei in einem Fenster pr\u00E4sentiert wird. Wenn Sie keinen Text eingeben, so wird sinngem\u00E4ss folgender Text ausgegeben\: Hiermit wird best\u00E4tigt, dass Meier Hubert (hmeier) die Datei "test.html" am 21.09.04 um 00\:14\:42 hochgeladen hat.
 chelp.conf2=Wenn Sie diese Option anklicken, so wird dem Benutzer nach erfolgreicher Abgabe seiner Datei ein E-Mail mit dem obigen Best\u00E4tigungstext geschickt.
 chelp.dropbox=<b>$\:pane.tab.conf.dropbox</b>
@@ -21,8 +22,7 @@ chelp.prevFalse=<i>&laquo;$\:form.task.without.preview&raquo;</i>
 chelp.prevTrue=<i>&laquo;$\:form.task.with.preview&raquo;</i>
 chelp.scoring=<b>$\:pane.tab.conf.scoring</b>
 chelp.sel1=Hier k\u00F6nnen Sie bestimmen, welche der Teilbausteine $\:chelp.task, $\:chelp.dropbox, $\:chelp.scoring oder $\:chelp.solution im Kursbaustein $\:chelp.taskNode zur Anwendung kommen. Wenn Sie keine \u00C4nderungen vornehmen, sind alle Teilbausteine aktiv. Wenn Sie einen oder zwei Teilbausteine abw\u00E4hlen und speichern dr\u00FCcken, k\u00F6nnen die entsprechenden Tabs nicht mehr angew\u00E4hlt werden und sind abgedimmt.
-chelp.sel2=Sie m\u00FCssen mindestens einen Teilbaustein w\u00E4hlen.
-chelp.sol1=Hier k\u00F6nnen Sie Ihren Kursteilnehmern Musterl\u00F6sungen in den Musterlösungsordner legen.
+chelp.sol1=Hier k\u00F6nnen Sie Ihren Kursteilnehmern Musterl\u00F6sungen in den Musterl\u00F6sungsordner legen.
 chelp.solution=<b>$\:pane.tab.solution</b>
 chelp.task=<b>$\:pane.tab.conf.task</b>
 chelp.taskNode=<i>$org.olat.course.nodes\:title_ta</i>
@@ -34,7 +34,7 @@ conf.mail.error=Diese Best\u00E4tigung sollte per E-Mail verschickt werden. Dabe
 conf.mail.sent=Diese Best\u00E4tigung wurde als E-Mail an die Adresse {0} verschickt.
 conf.mail.subject=OLAT-Best\u00E4tigungs-E-Mail
 conf.stdtext=Hiermit wird best\u00E4tigt, dass $first $last ($email) die Datei "$filename" am $date um $time hochgeladen hat.
-conf.stdtext.example=Beispiel: Hiermit wird best\u00E4tigt, dass $first $last ($email) die Datei "$filename" am $date um $time hochgeladen hat.
+conf.stdtext.example=Beispiel\: Hiermit wird best\u00E4tigt, dass $first $last ($email) die Datei "$filename" am $date um $time hochgeladen hat.
 conf.title=Best\u00E4tigung
 dropbox.condition.title=Abgabeordner
 dropbox.files=Sie haben bereits {0} Datei(en) hochgeladen.
@@ -45,35 +45,32 @@ dropbox.notifications.header=Abgabeordner in Kurs "{0}"
 dropbox.title=Abgabeordner
 dropbox.upload=Datei hochladen
 dropbox.upload.failed=Datei konnte nicht hochgeladen werden
-returnbox.condition.title=R\u00FCckgabeordner 
-returnbox.notifications.entry=Datei "{0}" von {1}
-returnbox.notifications.header=R\u00FCckgabeordner in Kurs "{0}"
-solution.notifications.entry=Datei "{0}" von {1}
-solution.notifications.header=Musterl\u00F6sung in Kurs "{0}"
 error.dropbox.missing.group.long=Keine Lerngruppe oder Lernbereich konfiguriert f\u00FCr den Abgabeordner. F\u00FCr den Abgabeordner (unter Zugang) muss mindestens eine Lerngruppe oder Lernbereich konfiguriert werden.
 error.dropbox.missing.group.short=Keine Lerngruppe oder Lernbereich konfiguriert f\u00FCr den Abgabeordner. F\u00FCr den Abgabeordner (unter Zugang) muss mindestens eine Lerngruppe oder Lernbereich konfiguriert werden.
-error.returnbox.missing.group.long=Keine Lerngruppe oder Lernbereich konfiguriert f\u00FCr den Rückgabeordner. F\u00FCr den Rückgabeordner (unter Zugang) muss mindestens eine Lerngruppe oder Lernbereich konfiguriert werden.
-error.returnbox.missing.group.short=Keine Lerngruppe oder Lernbereich konfiguriert f\u00FCr den Rückgabeordner. F\u00FCr den Rückgabeordner (unter Zugang) muss mindestens eine Lerngruppe oder Lernbereich konfiguriert werden.
 error.missing.group.long=Keine Lerngruppe oder Lernbereich vorhanden. F\u00FCr den Aufgabenbaustein muss mindestens eine Lerngruppe oder Lernbereich erstellt werden.
 error.missing.group.short=Keine Lerngruppe oder Lernbereich vorhanden. F\u00FCr den Aufgabenbaustein muss mindestens eine Lerngruppe oder Lernbereich erstellt werden.
 error.missingscoreconfig.long=\u00D6ffnen Sie den Tab "Bewertung", um "{0}" zu korrigieren.
 error.missingscoreconfig.short=Die Bewertung f\u00FCr "{0}" ist nicht korrekt konfiguriert.
+error.nomailbody=Sie m\u00FCssen einen Text eingeben, damit eine E-Mail verschickt werden kann.
+error.returnbox.missing.group.long=Keine Lerngruppe oder Lernbereich konfiguriert f\u00FCr den R\u00FCckgabeordner. F\u00FCr den R\u00FCckgabeordner (unter Zugang) muss mindestens eine Lerngruppe oder Lernbereich konfiguriert werden.
+error.returnbox.missing.group.short=Keine Lerngruppe oder Lernbereich konfiguriert f\u00FCr den R\u00FCckgabeordner. F\u00FCr den R\u00FCckgabeordner (unter Zugang) muss mindestens eine Lerngruppe oder Lernbereich konfiguriert werden.
 error.scoring.missing.group.long=Keine Lerngruppe oder Lernbereich konfiguriert f\u00FCr die Bewertung. F\u00FCr die Bewertung (unter Zugang) muss mindestens eine Lerngruppe oder Lernbereich konfiguriert werden.
 error.scoring.missing.group.short=Keine Lerngruppe oder Lernbereich konfiguriert f\u00FCr die Bewertung. F\u00FCr die Bewertung (unter Zugang) muss mindestens eine Lerngruppe oder Lernbereich konfiguriert werden.
 error.solution.missing.group.long=Keine Lerngruppe oder Lernbereich konfiguriert f\u00FCr die Musterl\u00F6sung. F\u00FCr die Musterl\u00F6sung (unter Zugang) muss mindestens eine Lerngruppe oder Lernbereich konfiguriert werden.
 error.solution.missing.group.short=Keine Lerngruppe oder Lernbereich konfiguriert f\u00FCr die Musterl\u00F6sung. F\u00FCr die Musterl\u00F6sung (unter Zugang) muss mindestens eine Lerngruppe oder Lernbereich konfiguriert werden.
-fieldset.dropbox.title=Bestätigung der Abgabe
+fieldset.dropbox.title=Best\u00E4tigung der Abgabe
 folder.close=Aufgabenordner schliessen
 form.dropbox.confirmation=Text nach erfolgter Abgabe
 form.dropbox.enablemail=Text zus\u00E4tzlich als E-Mail verschicken
 form.modules.dropbox=Abgabeordner
-form.modules.returnbox= R\u00FCckgabeordner
 form.modules.error.checkOne=Bitte w\u00E4hlen Sie mindestens einen der untergeordneten Teilbausteinen aus.
+form.modules.returnbox=R\u00FCckgabeordner
 form.modules.sample=Musterl\u00F6sung
 form.modules.scoring=Bewertung
 form.modules.task=Zuweisung
-form.modules.title=Aufgabenbaustein: Teilbausteine auswählen
+form.modules.title=Aufgabenbaustein\: Teilbausteine ausw\u00E4hlen
 form.status.selection=Der Teilnehmer hat alle gew\u00FCnschten Aufgaben erf\u00FCllt.
+form.task.deselect=Abw\u00E4hlen
 form.task.preview=Vorschau
 form.task.sampling=Typ der Ziehung
 form.task.sampling.with=Aufgabe wird mehreren Benutzern zugewiesen
@@ -83,12 +80,11 @@ form.task.title=Aufgabe zuweisen
 form.task.type=Art der Zuweisung
 form.task.type.auto=Automatische Zuweisung einer Aufgabe
 form.task.type.manual=Der Benutzer w\u00E4hlt die Aufgabe manuell
+form.task.with.deselect=Aufgabe kann ausgetauscht werden
 form.task.with.preview=Ja, Aufgabe kann vor Zuweisung angeschaut werden 
+form.task.without.deselect=Aufgabe kann nur ein Mal gew\u00E4hlt werden
 form.task.without.preview=Nein, direkte Wahl der Aufgabe anhand des Titels
 form.taskfolder.title=Aufgaben hochladen
-form.task.deselect=Abwählen
-form.task.with.deselect=Aufgabe kann ausgetauscht werden
-form.task.without.deselect=Aufgabe kann nur ein Mal gewählt werden
 help.hover.ta-access=Hilfe, um den Zugang zu den Teilbausteinen zu konfigurieren
 help.hover.ta-conf=Hilfe zur Zuweisung von Aufgaben im Aufgabenbaustein
 help.hover.ta-dropbox=Hilfe zur Konfiguration des Best\u00E4tigungstextes
@@ -103,9 +99,12 @@ pane.tab.conf.modules=Teilbausteine
 pane.tab.conf.scoring=Bewertung
 pane.tab.conf.task=Zuweisung
 pane.tab.solution=Musterl\u00F6sung
+returnbox.condition.title=R\u00FCckgabeordner 
 returnbox.email.body={3}\n\nIm R\u00FCckgabeordner von Kurs \: {0}\nin Kursbaustein \: {1}\nwurde von Ihrem Betreuer die Datei \: {2}\nf\u00FCr Sie abgelegt. 
 returnbox.email.subject=[OLAT] Neue Datei in Ihrem R\u00FCckgabeordner
 returnbox.intro=Hier finden Sie Dateien, die Ihr Betreuer Ihnen zur\u00FCckgegeben hat.
+returnbox.notifications.entry=Datei "{0}" von {1}
+returnbox.notifications.header=R\u00FCckgabeordner in Kurs "{0}"
 returnbox.title=R\u00FCckgabeordner
 scoring.condition.title=Bewertung
 scoring.config.enable.button=\u00C4ndern
@@ -113,6 +112,8 @@ scoring.overwriting=Es wurden bereits Bewertungen vorgenommen. Wollen Sie die Be
 scoring.overwriting.note=Hinweis \: Sie \u00E4ndern die Bewertungskonfiguration obwohl bereits Bewertungen vorgenommen wurden.
 scoring.title=Bewertung
 solution.condition.title=Musterl\u00F6sung
+solution.notifications.entry=Datei "{0}" von {1}
+solution.notifications.header=Musterl\u00F6sung in Kurs "{0}"
 solutionbox.intro=Hier finden Sie Musterl\u00F6sungen, die Ihr Betreuer Ihnen zur Verf\u00FCgung stellt.
 solutionbox.title=Musterl\u00F6sung
 status.not_ok=Nicht OK
@@ -121,25 +122,24 @@ status.title=Status
 status.undefined=-
 status.working_on=In Bearbeitung
 task.assigned=Ihnen wurde folgende Aufgabe zugewiesen\:
+task.cancel=Aufgabe zur\u00FCcknehmen
+task.cancel.reassign=Wenn Sie die Aufgabe zur\u00FCcknehmen, muss dem Benutzer eine neue Aufgabe zugewiesen werden. Wollen Sie fortfahren?
 task.choose=Bitte w\u00E4hlen Sie eine Aufgabe aus untenstehender Liste.
 task.chosen=Die Aufgabe die Sie gezogen haben, wurde in der Zwischenzeit von einem anderen Benutzer gezogen. Bitte ziehen Sie erneut eine Aufgabe.
 task.condition.title=Zuweisung
+task.deleted.body=*** Das ist eine automatisch generierte Nachricht. Bitte antworten Sie nicht auf diese Nachricht *** \n\n Die Aufgabe "$filename" wurde von $first $last zur\u00FCckgezogen.\n\n Bitte \u00F6ffnen Sie $coursename ($courselink) f\u00FCr die Zuweisung einer neuen Aufgabe. \n\n Bei Fragen kontaktieren Sie bitte $first $last ($email).
+task.deleted.subject=Ihre Aufgabe wurde zur\u00FCckgezogen
 task.launch=Aufgabe ansehen
 task.nomoretasks=Es stehen keine weiteren Aufgaben zur Auswahl. Bitte kontaktieren Sie Ihren Kursbetreuer oder Ihre Kursbetreuerin.
 task.scoring.assigned=Diesem Benutzer wurde folgende Aufgabe zugewiesen\:
 task.scoring.notassigned=Diesem Benutzer wurde noch keine Aufgabe zugewiesen.
 task.table.choose=W\u00E4hlen
-task.table.th_action=Wählen
-task.table.th_deselect=Abwählen
-task.table.deselect=Abwählen 
+task.table.deselect=Abw\u00E4hlen 
+task.table.th_action=W\u00E4hlen
+task.table.th_deselect=Abw\u00E4hlen
 task.table.th_task=Aufgabe
 task.title=Zuweisung
 taskfolder=Aufgabenordner \u00F6ffnen
 taskfolder.empty=<i>Es wurde noch kein Ordner gew\u00E4hlt.</i>
 taskfolder.overwriting.confirm=Es wurden bereits {0} Aufgaben gezogen. Soll die Aufgabenliste ge\u00E4ndert werden ?
 warn.nodedelete=Achtung\: Alle bisher angefallenen Daten dieses Kursbausteines werden gel\u00F6scht. Dies beinhaltet auch den gesamten Inhalt des Aufgabenordners dieses Bausteines.
-error.nomailbody=Sie müssen einen Text eingeben, damit eine E-Mail verschickt werden kann.
-task.deleted.subject= Ihre Aufgabe wurde zurückgezogen
-task.deleted.body = *** Das ist eine automatisch generierte Nachricht. Bitte antworten Sie nicht auf diese Nachricht *** \n\n Die Aufgabe "$filename" wurde von $first $last zurückgezogen.\n\n Bitte öffnen Sie $coursename ($courselink) für die Zuweisung einer neuen Aufgabe. \n\n Bei Fragen kontaktieren Sie bitte $first $last ($email).
-task.cancel=Aufgabe zurücknehmen
-task.cancel.reassign = Wenn Sie die Aufgabe zurücknehmen, muss dem Benutzer eine neue Aufgabe zugewiesen werden. Wollen Sie fortfahren?
\ No newline at end of file
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_el.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_el.properties
index 813fd3cc35aac08590893345882e730f475f07f4..55e28c5fcc5457056b0d435f73b204ced8635e7c 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_el.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_el.properties
@@ -1,4 +1,5 @@
-#Wed Sep 15 11:53:26 CEST 2010
+#Wed Nov 04 23:38:15 CET 2015
+atleastone=\u03A0\u03C1\u03AD\u03C0\u03B5\u03B9 \u03BD\u03B1 \u03B5\u03C0\u03B9\u03BB\u03AD\u03BE\u03B5\u03C4\u03B5 \u03C4\u03BF\u03C5\u03BB\u03AC\u03C7\u03B9\u03C3\u03C4\u03BF\u03BD \u03AD\u03BD\u03B1 \u03C5\u03C0\u03BF-\u03C3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03BF.
 chelp.ass1=\u0395\u03B4\u03CE \u03BA\u03B1\u03B8\u03BF\u03C1\u03AF\u03B6\u03B5\u03C4\u03B5 \u03C0\u03CE\u03C2 \u03B8\u03B1 \u03B4\u03B9\u03B1\u03BD\u03AD\u03BC\u03BF\u03BD\u03C4\u03B1\u03B9 \u03BF\u03B9 \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B5\u03C2 \u03C4\u03BF\u03C5 $\:chelp.taskfolder \u03C3\u03C4\u03BF\u03C5\u03C2 \u03C3\u03C5\u03BC\u03BC\u03B5\u03C4\u03AD\u03C7\u03BF\u03BD\u03C4\u03B5\u03C2 \u03C3\u03C4\u03BF \u03BC\u03AC\u03B8\u03B7\u03BC\u03AC \u03C3\u03B1\u03C2.
 chelp.ass2=\u0388\u03C7\u03B5\u03C4\u03B5 \u03C4\u03B7 \u03B4\u03C5\u03BD\u03B1\u03C4\u03CC\u03C4\u03B7\u03C4\u03B1 \u03BD\u03B1 \u03B4\u03CE\u03C3\u03B5\u03C4\u03B5 \u03C3\u03C4\u03BF\u03C5\u03C2 \u03C7\u03C1\u03AE\u03C3\u03C4\u03B5\u03C2 \u03C3\u03B1\u03C2 \u03BA\u03AC\u03C0\u03BF\u03B9\u03B5\u03C2 \u03C0\u03BB\u03B7\u03C1\u03BF\u03C6\u03BF\u03C1\u03AF\u03B5\u03C2.
 chelp.ass3=\u0395\u03AF\u03C4\u03B5 \u03BF\u03B9 \u03C7\u03C1\u03AE\u03C3\u03C4\u03B5\u03C2 \u03C3\u03B1\u03C2 \u03BC\u03C0\u03BF\u03C1\u03BF\u03CD\u03BD \u03BD\u03B1 \u03B4\u03BF\u03C5\u03BD \u03C4\u03B9\u03C2 \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B5\u03C2 \u03C0\u03BF\u03C5 \u03AD\u03C7\u03B5\u03C4\u03B5 \u03B8\u03AD\u03C3\u03B5\u03B9 \u03C3\u03C4\u03B7 \u03B4\u03B9\u03AC\u03B8\u03B5\u03C3\u03AE \u03C4\u03BF\u03C5\u03C2 \u03CE\u03C3\u03C4\u03B5 \u03BD\u03B1 \u03B5\u03C0\u03B9\u03BB\u03AD\u03BE\u03BF\u03C5\u03BD \u03BC\u03AF\u03B1 \u03B1\u03C0'\u03B1\u03C5\u03C4\u03AD\u03C2 \u03AE \u03BC\u03B9\u03B1 \u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1 \u03B1\u03BD\u03B1\u03C4\u03AF\u03B8\u03B5\u03C4\u03B1\u03B9 \u03C3'\u03B1\u03C5\u03C4\u03BF\u03CD\u03C2 \u03B1\u03C5\u03C4\u03CC\u03BC\u03B1\u03C4\u03B1.
@@ -20,7 +21,6 @@ chelp.prevFalse=<i>&laquo;$\:form.task.without.preview&raquo;</i>
 chelp.prevTrue=<i>&laquo;$\:form.task.with.preview&raquo;</i>
 chelp.scoring=<b>$\:pane.tab.conf.scoring</b>
 chelp.sel1=\u0395\u03B4\u03CE \u03BC\u03C0\u03BF\u03C1\u03B5\u03AF\u03C4\u03B5 \u03BD\u03B1 \u03BA\u03B1\u03B8\u03BF\u03C1\u03AF\u03C3\u03B5\u03C4\u03B5 \u03C0\u03BF\u03B9\u03CC \u03B1\u03C0\u03CC \u03C4\u03B1 \u03C5\u03C0\u03BF-\u03C3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03B1 $\:chelp.task, $\:chelp.dropbox \u03AE $\:chelp.scoring \u03C4\u03BF\u03C5 \u03C3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03BF\u03C5 \u03BC\u03B1\u03B8\u03AE\u03BC\u03B1\u03C4\u03BF\u03C2 $\:chelp.taskNode \u03B8\u03B1 \u03C0\u03C1\u03AD\u03C0\u03B5\u03B9 \u03BD\u03B1 \u03C7\u03C1\u03B7\u03C3\u03B9\u03BC\u03BF\u03C0\u03BF\u03B9\u03B7\u03B8\u03B5\u03AF. \u0391\u03BD \u03B4\u03B5\u03BD \u03BA\u03AC\u03BD\u03B5\u03C4\u03B5 \u03BA\u03B1\u03BC\u03B9\u03AC \u03C4\u03C1\u03BF\u03C0\u03BF\u03C0\u03BF\u03AF\u03B7\u03C3\u03B7 \u03CC\u03BB\u03B1 \u03C4\u03B1 \u03C5\u03C0\u03BF-\u03C3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03B1 \u03B8\u03B1 \u03B5\u03AF\u03BD\u03B1\u03B9 \u03B5\u03BD\u03B5\u03C1\u03B3\u03AC. \u0391\u03BD \u03B1\u03C0\u03BF\u03B5\u03C0\u03B9\u03BB\u03AD\u03BE\u03B5\u03C4\u03B5 \u03AD\u03BD\u03B1 \u03AE \u03B4\u03CD\u03BF \u03C5\u03C0\u03BF-\u03C3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03B1 \u03BA\u03B1\u03B9 \u03B1\u03C0\u03BF\u03B8\u03B7\u03BA\u03B5\u03CD\u03C3\u03B5\u03C4\u03B5 \u03B1\u03C5\u03C4\u03AE \u03C4\u03B7 \u03C1\u03CD\u03B8\u03BC\u03B9\u03C3\u03B7, \u03C4\u03B1 \u03B1\u03BD\u03C4\u03AF\u03C3\u03C4\u03BF\u03B9\u03C7\u03B1 tabs \u03B4\u03B5\u03BD \u03BC\u03C0\u03BF\u03C1\u03BF\u03CD\u03BD \u03BD\u03B1 \u03B5\u03C0\u03B9\u03BB\u03B5\u03B3\u03BF\u03CD\u03BD \u03C0\u03B9\u03B1 \u03BA\u03B1\u03B9 \u03B5\u03AF\u03BD\u03B1\u03B9 \u03B1\u03BD\u03B5\u03BD\u03B5\u03C1\u03B3\u03AC.
-chelp.sel2=\u03A0\u03C1\u03AD\u03C0\u03B5\u03B9 \u03BD\u03B1 \u03B5\u03C0\u03B9\u03BB\u03AD\u03BE\u03B5\u03C4\u03B5 \u03C4\u03BF\u03C5\u03BB\u03AC\u03C7\u03B9\u03C3\u03C4\u03BF\u03BD \u03AD\u03BD\u03B1 \u03C5\u03C0\u03BF-\u03C3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03BF.
 chelp.sol1=\u0395\u03B4\u03CE \u03BC\u03C0\u03BF\u03C1\u03B5\u03AF\u03C4\u03B5 \u03BD\u03B1 \u03C0\u03B1\u03C1\u03AD\u03C7\u03B5\u03C4\u03B5 \u03C3\u03C4\u03BF\u03C5\u03C2 \u03C3\u03C5\u03BC\u03BC\u03B5\u03C4\u03AD\u03C7\u03BF\u03BD\u03C4\u03B5\u03C2 \u03C3\u03C4\u03BF \u03BC\u03AC\u03B8\u03B7\u03BC\u03B1 \u03B4\u03B5\u03AF\u03B3\u03BC\u03B1\u03C4\u03B1 \u03BB\u03CD\u03C3\u03B5\u03C9\u03BD \u03C3\u03C4\u03BF $\:chelp.linkSol .\t
 chelp.solution=<b>$\:pane.tab.solution</b>
 chelp.task=<b>$\:pane.tab.conf.task</b>
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_en.properties
index d957051001198241469112fc30e006ece597da02..39d54ed3e379e20ea4bc4e82fad048e893ef9d0b 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_en.properties
@@ -1,4 +1,5 @@
-#Fri Jan 21 15:31:31 CET 2011
+#Wed Nov 04 23:38:15 CET 2015
+atleastone=You have to select at least one sub-element.
 bulk.download.title=Download all drop boxes
 chelp.ass1=Here you determine how the tasks of $\:chelp.taskfolder will be distributed to your course participants.
 chelp.ass2=You have the possibility to give your users some information.
@@ -21,7 +22,6 @@ chelp.prevFalse=<i>&laquo;$\:form.task.without.preview&raquo;</i>
 chelp.prevTrue=<i>&laquo;$\:form.task.with.preview&raquo;</i>
 chelp.scoring=<b>$\:pane.tab.conf.scoring</b>
 chelp.sel1=Here you can determine which of the sub-elements $\:chelp.task, $\:chelp.dropbox or $\:chelp.scoring of the course element $org.olat.course.nodes\:title_ta should be used. If you do not make an alteration all sub-elements will be active. If you deselect one or two sub-elements and save this setting, the relevant tabs cannot be selected anymore and are inactive.
-chelp.sel2=You have to select at least one sub-element.
 chelp.sol1=Here you can provide your course participants with sample solutions in a sample solution folder.
 chelp.solution=<b>$\:pane.tab.solution</b>
 chelp.task=<b>$\:pane.tab.conf.task</b>
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_es.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_es.properties
index 179c74af93a83dcabf359492011c67c3307791a5..49e983c8089b363e7795df51ff902436420d8852 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_es.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_es.properties
@@ -1,4 +1,5 @@
-#Tue Apr 28 17:58:25 CEST 2009
+#Wed Nov 04 23:38:15 CET 2015
+atleastone=Debe seleccionar al menos un sub-elemento.
 chelp.ass1=Aqu\u00ED puede determinar c\u00F3mo las tareas de la $\:chelp.taskfolder ser\u00E1n distribuidas a los participantes del curso.
 chelp.ass2=Es posible suministrarle cierta informaci\u00F3n a sus usuarios.
 chelp.ass3=El usuario podr\u00E1 ver las tareas que usted le haya puesto a disposici\u00F3n y puede escoger una, o las tareas se le asignan autom\u00E1ticamente.
@@ -20,7 +21,6 @@ chelp.prevFalse=<i>&laquo;$\:form.task.without.preview&raquo;</i>
 chelp.prevTrue=<i>&laquo;$\:form.task.with.preview&raquo;</i>
 chelp.scoring=<b>$\:pane.tab.conf.scoring</b>
 chelp.sel1=Aqu\u00ED puede determinar cu\u00E1les de los sub-elementos $\:chelp.task, $\:chelp.dropbox o $\:chelp.scoring del elemento de curso $\:chelp.taskNode deben ser usados. Si no realiza ninguna modificaci\u00F3n todos los subelementos estar\u00E1n activos. Si desmarca uno o m\u00E1s sub-elementos y guarda esta opci\u00F3n, las pesta\u00F1as m\u00E1s importantes no pueden ser seleccionadas m\u00E1s y est\u00E1n inactivas.
-chelp.sel2=Debe seleccionar al menos un sub-elemento.
 chelp.sol1=Soluci\u00F3n de muestra para los participantes del curso\: $\:chelp.linkSol .\t
 chelp.solution=<b>$\:pane.tab.solution</b>
 chelp.task=<b>$\:pane.tab.conf.task</b>
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_fa.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_fa.properties
index 4b65c8a9cb7845ee4e2547ce2e6e9a9995229efe..5a099cdadb0480fa9e95062878f4284b8ac7c502 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_fa.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_fa.properties
@@ -1,4 +1,4 @@
-#Mon Mar 02 09:54:12 CET 2009
+#Wed Nov 04 23:38:15 CET 2015
 chelp.ced-ta-assign.title=$\:form.task.title
 chelp.ced-ta-conf.title=$\:fieldset.dropbox.title
 chelp.ced-ta-select.title=$\:form.modules.title
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_fr.properties
index 42f4901a421bc4145e3c527eff0c4aaf312cee5b..359b74e834d97b3a03aa3cf170d4f2f8f44aafa8 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_fr.properties
@@ -1,4 +1,5 @@
-#Fri Jan 10 09:29:02 CET 2014
+#Wed Nov 04 23:38:15 CET 2015
+atleastone=Vous devez choisir au moins un des \u00E9l\u00E9ments partiels.
 bulk.download.title=T\u00E9l\u00E9charger tous les dossier de restitution
 chelp.ass1=Ici vous d\u00E9cidez comment les t\u00E2ches dans le $\:chelp.taskfolder sont distribu\u00E9es aux participants au cours.
 chelp.ass2=Vous avez la possibilit\u00E9 de faire afficher une information aux utilisateurs.
@@ -21,7 +22,6 @@ chelp.prevFalse=<i>&laquo;$\:form.task.without.preview&raquo;</i>
 chelp.prevTrue=<i>&laquo;$\:form.task.with.preview&raquo;</i>
 chelp.scoring=<b>$\:pane.tab.conf.scoring</b>
 chelp.sel1=Vous pouvez ici d\u00E9cider quels \u00E9l\u00E9ments partiels $\:chelp.task, $\:chelp.dropbox ou $\:chelp.scoring seront utilis\u00E9s dans l'\u00E9l\u00E9ment de cours $\:chelp.taskNode . Si vous ne faites pas de changements, tous les \u00E9l\u00E9ments partiels sont actifs. Si vous en d\u00E9s\u00E9lectionnez un ou deux et cliquez sur "Enregistrer", les onglets correspondants ne pourront plus \u00EAtre activ\u00E9s et pr\u00E9sentent un affichage transparent.
-chelp.sel2=Vous devez choisir au moins un des \u00E9l\u00E9ments partiels.
 chelp.sol1=Ici vous pouvez d\u00E9poser les solutions mod\u00E8les dans le dossier des solutions mod\u00E8les pour vos participants de cours.
 chelp.solution=<b>$\:pane.tab.solution</b>
 chelp.task=<b>$\:pane.tab.conf.task</b>
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_it.properties
index 428208eb171aadf693ee720238db162f5a455cb8..b1f6edbfeb1b0c2a7ee417a66a0a4c06e6531bfe 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_it.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_it.properties
@@ -1,4 +1,5 @@
-#Sun Jan 09 15:28:06 CET 2011
+#Wed Nov 04 23:38:15 CET 2015
+atleastone=Deve selezionare almeno un elemento parziale.
 chelp.ass1=Pu\u00F2 stabilire qui in quale modo i compiti che si trovano nella cartella dei compiti verranno distribuiti ai partecipanti al corso.
 chelp.ass2=Ha la possibilit\u00E0 di mostrare un'informazione agli utenti.
 chelp.ass3=L'utente pu\u00F2 vedere i compiti da Lei messi a disposizione e pu\u00F2 sceglierne uno, oppure i compiti vengono assegnati automaticamente.
@@ -20,7 +21,6 @@ chelp.prevFalse=<i>&laquo;$\:form.task.without.preview&raquo;</i>
 chelp.prevTrue=<i>&laquo;$\:form.task.with.preview&raquo;</i>
 chelp.scoring=<b>$\:pane.tab.conf.scoring</b>
 chelp.sel1=Pu\u00F2 stabilire qui quali elementi parziali, vale a dire $\:chelp.task, $\:chelp.dropbox o $\:chelp.scoring, vuole utilizzare nell'elemento di corso $\:chelp.taskNode . Nel caso non operi modifiche tutti gli elementi parziali verranno attivati. Se sceglie uno o due elementi parziali e salva la modifica, le schede corrispondenti agli elementi esclusi non potranno pi\u00F9 venire selezionate e i loro titoli verranno affievoliti.
-chelp.sel2=Deve selezionare almeno un elemento parziale.
 chelp.sol1=Qui pu\u00F2 deporre nella cartella delle soluzioni modello le soluzioni modello per i partecipanti al Suo corso.
 chelp.solution=<b>$\:pane.tab.solution</b>
 chelp.task=<b>$\:pane.tab.conf.task</b>
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_jp.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_jp.properties
index 38adb7feee52ace898c0d55902995a4b07ff1df6..9606f1ed46766703686795d60d0d911367486178 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_jp.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_jp.properties
@@ -1,4 +1,5 @@
-#Tue Nov 02 03:54:26 CET 2010
+#Wed Nov 04 23:38:15 CET 2015
+atleastone=\u3042\u306A\u305F\u306F\u3001\u5C11\u306A\u304F\u3068\u30821\u3064\u306E\u30B5\u30D6\u30A8\u30EC\u30E1\u30F3\u30C8\u3092\u9078\u629E\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
 chelp.ass1=\u3042\u306A\u305F\u306E\u30B3\u30FC\u30B9\u53C2\u52A0\u8005\u306B\u5BFE\u3057\u3066 $\:chelp.taskfolder \u306E\u30BF\u30B9\u30AF\u304C\u3069\u306E\u3088\u3046\u306B\u63D0\u4F9B\u3055\u308C\u308B\u304B\u6C7A\u5B9A\u3057\u307E\u3059\u3002
 chelp.ass2=\u3042\u306A\u305F\u306F\u3001\u30E6\u30FC\u30B6\u306B\u60C5\u5831\u3092\u63D0\u4F9B\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002
 chelp.ass3=\u3042\u306A\u305F\u306E\u30E6\u30FC\u30B6\u304C\u81EA\u7531\u306B1\u3064\u306E\u30BF\u30B9\u30AF\u3092\u9078\u629E\u3067\u304D\u308B\u3088\u3046\u306B\u3059\u308B\u3001\u307E\u305F\u306F\u81EA\u52D5\u7684\u306B\u30BF\u30B9\u30AF\u304C\u5272\u308A\u5F53\u3066\u3089\u308C\u307E\u3059\u3002
@@ -18,7 +19,6 @@ chelp.modules=<b>$\:pane.tab.conf.modules</b>
 chelp.prevFalse=<i>\u00AB$\:form.task.without.preview\u00BB</i>
 chelp.prevTrue=<i>\u00AB$\:form.task.with.preview\u00BB</i>
 chelp.scoring=<b>$\:pane.tab.conf.scoring</b>
-chelp.sel2=\u3042\u306A\u305F\u306F\u3001\u5C11\u306A\u304F\u3068\u30821\u3064\u306E\u30B5\u30D6\u30A8\u30EC\u30E1\u30F3\u30C8\u3092\u9078\u629E\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
 chelp.sol1=\u3053\u3053\u3067\u3042\u306A\u305F\u306F\u3001 $\:chelp.linkSol \u306B\u3066\u3001\u30B3\u30FC\u30B9\u53C2\u52A0\u8005\u306B\u30B5\u30F3\u30D7\u30EB\u89E3\u7B54\u3092\u63D0\u4F9B\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002
 chelp.solution=<b>$\:pane.tab.solution</b>
 chelp.task=<b>$\:pane.tab.conf.task</b>
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_lt.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_lt.properties
index 86a5442ae555d6282ac2c8b00f7def6cbd3604d8..aa8d080916d6d2f551f72e350bb14b355fe8ae51 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_lt.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_lt.properties
@@ -1,4 +1,5 @@
-#Mon Mar 02 09:54:02 CET 2009
+#Wed Nov 04 23:38:15 CET 2015
+atleastone=J\u016Bs turite pa\u017Eym\u0117ti ma\u017Eiausiai vien\u0105 po-element\u012F.
 chelp.ass1=\u010Cia j\u016Bs nuspr\u0119site kaip $\:chelp.taskfolder u\u017Eduotis bus paskirstoma j\u016Bs\u0173 kurso dalyviams.
 chelp.ass2=J\u016Bs turite galimyb\u0119 teikti vartotojams kai kuria informacij\u0105.
 chelp.ass3=Arba j\u016Bs\u0173 vartotojai gali matyti u\u017Eduotis, kurias j\u016Bs jiems perdav\u0117te, kad jie i\u0161sirinkt\u0173 vien\u0105 i\u0161 j\u0173, arba u\u017Eduotis jiems priskiriama automati\u0161kai.
@@ -18,7 +19,6 @@ chelp.prevFalse=<i>&laquo;$\:form.task.without.preview&raquo;</i>
 chelp.prevTrue=<i>&laquo;$\:form.task.with.preview&raquo;</i>
 chelp.scoring=<b>$\:pane.tab.conf.scoring</b>
 chelp.sel1=J\u016Bs galite nuspr\u0119sti, kurie kurso elemento $\:chelp.taskNode po-elemen\u010Diai $\:chelp.task, $\:chelp.dropbox arba $\:chelp.scoring bus naudojami. Jei j\u016Bs nepadarysit pakeitim\u0173, visi po-elemen\u010Diai bus aktyv\u016Bs. Jei j\u016Bs pakeisite vien\u0105 ar du po-elemen\u010Dius ir i\u0161saugosite \u0161iuos nustatymus, aktualios kortel\u0117s negal\u0117s b\u016Bti daugiau pa\u017Eym\u0117tos ir bus neaktyvios.
-chelp.sel2=J\u016Bs turite pa\u017Eym\u0117ti ma\u017Eiausiai vien\u0105 po-element\u012F.
 chelp.solution=<b>$\:pane.tab.solution</b>
 chelp.task=<b>$\:pane.tab.conf.task</b>
 chelp.taskNode=<i>$org.olat.course.nodes\:title_ta</i>
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_nl_NL.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_nl_NL.properties
index a7492547968448ea0dc95fde8822872289608334..a671e118c6ab1f0a8cf069834220293b18153588 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_nl_NL.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_nl_NL.properties
@@ -1,4 +1,5 @@
-#Thu Sep 08 16:42:45 CEST 2011
+#Wed Nov 04 23:38:15 CET 2015
+atleastone=U moet tenminste \u00E9\u00E9n sub-elemente selecteren.
 chelp.ass1=Hier bepaalt u hoe de taken van $\:chelp.taskfolder gedistributeerd worden naar uw cursisten.
 chelp.ass2=U heeft de mogelijkheid om uw gebruikers wat informatie te geven.
 chelp.ass3=Uw gebruikers kunnen de taken zien die u ter hun beschikking heeft gesteld om zo \u00E9\u00E9n van die taken te kiezen, of taken worden automatisch tot hen toegeschreven.
@@ -20,7 +21,6 @@ chelp.prevFalse=<i>&laquo;$\:form.task.without.preview&raquo;</i>
 chelp.prevTrue=<i>&laquo;$\:form.task.with.preview&raquo;</i>
 chelp.scoring=<b>$\:pane.tab.conf.scoring</b>
 chelp.sel1=Hier kunt u bepalen welke van deze sub-elementen $\:chelp.task, $\:chelp.dropbox of $\:chelp.scoring van het cursuselement $org.olat.course.nodes\:title_ta gebruikt moet worden. Als u geen aanpassingen maakt, zullen alle sub-elementen actief zijn. Als u \u00E9\u00E9n of twee van deze sub-elementen deselecteert en deze instelling dan opslaat, kunnen de relevante tabs niet meer geselecteerd worden en zijn ze inactief.
-chelp.sel2=U moet tenminste \u00E9\u00E9n sub-elemente selecteren.
 chelp.sol1=Hier kunt u uw cursisten voorzien met voorbeeldoplossingen in een voorbeeldoplossingenmap.
 chelp.solution=<b>$\:pane.tab.solution</b>
 chelp.task=<b>$\:pane.tab.conf.task</b>
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_pl.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_pl.properties
index 2b8bcb8244323eb7e8197a98ef3d8d803a24b519..5a847ee83e9b25ccd42c762129b7afee0b68b573 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_pl.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_pl.properties
@@ -1,4 +1,5 @@
-#Mon Sep 20 10:53:50 CEST 2010
+#Wed Nov 04 23:38:15 CET 2015
+atleastone=Musisz wybra\u0107 co najmniej jeden podelement
 chelp.ass1=Tu mo\u017Cesz zdecydowa\u0107, jak zadania w $\:chelp.taskfolder b\u0119d\u0105 rozprzestrzeniane do uczestnik\u00F3w kursu.
 chelp.ass2=Masz mo\u017Cliwo\u015B\u0107 przekazania twoim u\u017Cytkownikom jakich\u015B informacji.
 chelp.ass3=U\u017Cytkownicy mog\u0105 widzie\u0107 przekazane do ich dyspozycji zadanie w celu wybrania jednego z nich lub zadanie jest przypisywane im automatycznie.
@@ -20,7 +21,6 @@ chelp.prevFalse=<i>&laquo;$\:form.task.without.preview&raquo;</i>
 chelp.prevTrue=<i>&laquo;$\:form.task.with.preview&raquo;</i>
 chelp.scoring=<b>$\:pane.tab.conf.scoring</b>
 chelp.sel1=Tu mo\u017Cesz zdecydowa\u0107, kt\u00F3ry z podelement\u00F3w $\:chelp.task, $\:chelp.dropbox czy $\:chelp.scoring elementu kursu $\:chelp.taskNode powinien zosta\u0107 u\u017Cyty. Domy\u015Blnie wszystkie podelementy b\u0119d\u0105 aktywne. Je\u015Bli zrezygnujesz z jednego lub dw\u00F3ch podelement\u00F3w i zachowasz to ustawienie, nie b\u0119dzie mo\u017Cna wybra\u0107 zak\u0142adki i b\u0119dzie ona nieaktywna.
-chelp.sel2=Musisz wybra\u0107 co najmniej jeden podelement
 chelp.sol1=Mo\u017Cesz udost\u0119pni\u0107 uczestnikom kursu przyk\u0142adowe rozwi\u0105zania w $\:chelp.linkSol.
 chelp.solution=<b>$\:pane.tab.solution</b>
 chelp.task=<b>$\:pane.tab.conf.task</b>
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_pt_BR.properties
index 157a4e160750b31f60fded1689ddaf225c004ded..d5285fd474510a0efd2744ec6304afa9da3c236b 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_pt_BR.properties
@@ -1,4 +1,5 @@
-#Fri Jan 24 18:41:49 CET 2014
+#Wed Nov 04 23:38:15 CET 2015
+atleastone=Voc\u00EA tem que selecionar no m\u00EDnimo um sub-elemento.
 bulk.download.title=Baixe todas as caixas (drop boxes)
 chelp.ass1=Aqui pode-se determinar como as tarefas da $\:chelp.taskfolder ser\u00E3o distribuidas aos participantes do curso.
 chelp.ass2=Possibilita fornecer informa\u00E7\u00F5es aos participantes.
@@ -21,7 +22,6 @@ chelp.prevFalse=<i>&laquo;$\:form.task.without.preview&raquo;</i>
 chelp.prevTrue=<i>&laquo;$\:form.task.with.preview&raquo;</i>
 chelp.scoring=<b>$\:pane.tab.conf.scoring</b>
 chelp.sel1=Aqui voc\u00EA poder\u00E1 determinar quais dos sub-elementos $\:chelp.task , $\:chelp.dropbox ou $\:chelp.scoring do elemento de curso $\:chelp.taskNode dever\u00E1 ser usado. Por padr\u00E3o, todos os sub-elementos ser\u00E3o ativados. Se voc\u00EA n\u00E3o selecionar um ou dois sub-elementos e salvar esta configura\u00E7\u00E3o, os sub-elementos inativos n\u00E3o poder\u00E3o mais ser selecionados.
-chelp.sel2=Voc\u00EA tem que selecionar no m\u00EDnimo um sub-elemento.
 chelp.sol1=Aqui voc\u00EA pode proporcionar aos seus participantes do curso amostras de solu\u00E7\u00E3o no $\:chelp.linkSol .\t
 chelp.solution=<b>$\:pane.tab.solution</b>
 chelp.task=<b>$\:pane.tab.conf.task</b>
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_pt_PT.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_pt_PT.properties
index 12e67c0e541d4c23d30a50b00521b9faebc987be..67dfb9dbd24b4af9fd6c79813e2ecab4bcaf11ae 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_pt_PT.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_pt_PT.properties
@@ -1,4 +1,5 @@
-#Mon Mar 02 09:54:05 CET 2009
+#Wed Nov 04 23:38:15 CET 2015
+atleastone=Voc\u00EA tem que selecionar no m\u00EDnimo um sub-elemento.
 chelp.ass1=Aqui pode-se determinar como as tarefas da $\:chelp.taskfolder ser\u00E3o distribuidas aos participantes do curso.
 chelp.ass2=Possibilita fornecer informa\u00E7\u00F5es aos participantes.
 chelp.ass3=Os participantes poder\u00E3o escolher uma das tarefas da lista ou uma das tarefas da lista ser\u00E1 atribuida a eles automaticamente.
@@ -20,7 +21,6 @@ chelp.prevFalse=<i>&laquo;$\:form.task.without.preview&raquo;</i>
 chelp.prevTrue=<i>&laquo;$\:form.task.with.preview&raquo;</i>
 chelp.scoring=<b>$\:pane.tab.conf.scoring</b>
 chelp.sel1=Aqui voc\u00EA poder\u00E1 determinar quais dos sub-elementos $\:chelp.task , $\:chelp.dropbox ou $\:chelp.scoring do elemento de curso $\:chelp.taskNode dever\u00E1 ser usado. Por padr\u00E3o, todos os sub-elementos ser\u00E3o ativados. Se voc\u00EA n\u00E3o selecionar um ou dois sub-elementos e salvar esta configura\u00E7\u00E3o, os sub-elementos inativos n\u00E3o poder\u00E3o mais ser selecionados.
-chelp.sel2=Voc\u00EA tem que selecionar no m\u00EDnimo um sub-elemento.
 chelp.sol1=Aqui voc\u00EA pode proporcionar aos seus participantes do curso amostras de solu\u00E7\u00E3o no $\:chelp.linkSol .\t
 chelp.solution=<b>$\:pane.tab.solution</b>
 chelp.task=<b>$\:pane.tab.conf.task</b>
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_ru.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_ru.properties
index b9cd5db0ece99d88486ccf3f53f1bdc6a0a7ed8d..ef1a7d617bf49fcce1fa2724e469160a532d2a9f 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_ru.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_ru.properties
@@ -1,4 +1,4 @@
-#Sun Jan 24 10:01:37 CET 2010
+#Wed Nov 04 23:38:15 CET 2015
 chelp.ced-ta-assign.title=$\:form.task.title
 chelp.ced-ta-conf.title=$\:fieldset.dropbox.title
 chelp.ced-ta-select.title=$\:form.modules.title
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_sq.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_sq.properties
index 37861eea418ea410c0f88691f32c22741292d53e..4963d8168444835d42e9ac1b69602306e0362eb5 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_sq.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_sq.properties
@@ -1,4 +1,5 @@
-#Mon Mar 02 09:54:11 CET 2009
+#Wed Nov 04 23:38:15 CET 2015
+atleastone=Ju duhet t\u00EB p\u00EBrzgjedhni t\u00EB pakt\u00EBn nj\u00EB nga n\u00EBn-elementet.
 chelp.ass1=K\u00EBtu ju mund t\u00EB p\u00EBrcaktoni si do t\u00EB shp\u00EBrndahen detyrat e $\:chelp.taskfolder pjes\u00EBmarr\u00EBsve t\u00EB kursit tuaj.
 chelp.ass2=Ju keni mund\u00EBsin\u00EB q\u00EB t'i jepni shfryt\u00EBzuesve tuaj ca informacione.
 chelp.ass3=Ose shfryt\u00EBzuesit tuaj jan\u00EB n\u00EB gjendje t\u00EB shohin detyrat q\u00EB ju keni v\u00EBn\u00EB n\u00EB dispozicionin e tyre n\u00EB m\u00EBnyr\u00EB q\u00EB t\u00EB p\u00EBrzgjedhni nj\u00EB nga ato ose nj\u00EB detyr\u00EB i p\u00EBrcaktohet atyre n\u00EB m\u00EBnyr\u00EB automatike.
@@ -20,7 +21,6 @@ chelp.prevFalse=<i>&laquo;$\:form.task.without.preview&raquo;</i>
 chelp.prevTrue=<i>&laquo;$\:form.task.with.preview&raquo;</i>
 chelp.scoring=<b>$\:pane.tab.conf.scoring</b>
 chelp.sel1=K\u00EBtu ju mund t\u00EB p\u00EBrcaktoni se cil\u00EBt nga n\u00EBn-elementet $\:chelp.task, $\:chelp.dropbox ose $\:chelp.scoring t\u00EB elementit t\u00EB kursit $\:chelp.taskNode duhet t\u00EB p\u00EBrdoren. N\u00EBse ju nuk e b\u00EBni n\u00EB ndryshim n\u00EB t\u00EB gjith\u00EB n\u00EBn-elementet do t\u00EB jen\u00EB aktive. N\u00EBse ju \u00E7'p\u00EBrzgjedhni nj\u00EB se dy n\u00EBn-elemente dhe e ruani k\u00EBt\u00EB p\u00EBrcaktim, tabet relevante nuk do t\u00EB mund t\u00EB p\u00EBrzgjidhen m\u00EB si dhe jan\u00EB pasive.
-chelp.sel2=Ju duhet t\u00EB p\u00EBrzgjedhni t\u00EB pakt\u00EBn nj\u00EB nga n\u00EBn-elementet.
 chelp.sol1=K\u00EBtu ju mund t\u00EB ofroni pjes\u00EBmarr\u00EBsve t\u00EB kursit tuaj nj\u00EB shembull zgjidhje n\u00EB $\:chelp.linkSol . \t
 chelp.solution=<b>$\:pane.tab.solution</b>
 chelp.task=<b>$\:pane.tab.conf.task</b>
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_zh_CN.properties
index d5d58e00093f418db8366444badebf7f73875179..5c26c2bfd5c9efd4b9f7e12a4e2a713fa31b8ca7 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_zh_CN.properties
@@ -1,4 +1,5 @@
-#Mon Aug 30 07:49:25 CEST 2010
+#Wed Nov 04 23:38:15 CET 2015
+atleastone=\u4F60\u5FC5\u987B\u81F3\u5C11\u9009\u62E9\u4E00\u4E2A\u5B50\u5143\u7D20.
 chelp.ass1=\u5728\u6B64\u60A8\u51B3\u5B9A\u4E86\u5982\u4F55\u5C06$\:chelp.taskfolder\u4EFB\u52A1\u6307\u6D3E\u4F60\u7684\u5B66\u7A0B\u53C2\u4E0E\u8005.
 chelp.ass2=\u60A8\u6709\u6743\u53D1\u9001\u7ED9\u60A8\u7684\u4F7F\u7528\u8005\u4E00\u4E9B\u4FE1\u606F.
 chelp.ass3=\u4EFB\u4F55\u4E00\u4E2A\u4F60\u7684\u7528\u6237\u53EF\u4EE5\u770B\u89C1\u4F60\u5E03\u7F6E\u7684\u4EFB\u52A1,\u4EE5\u4FBF\u4E8E\u8BA9\u4ED6\u4EEC\u9009\u62E9\u5176\u4E2D\u7684\u4E00\u4E2A\u4EFB\u52A1\u6216\u8005\u81EA\u52A8\u7684\u5206\u914D\u4E00\u4E2A\u4EFB\u52A1\u7ED9\u4ED6\u4EEC.
@@ -20,7 +21,6 @@ chelp.prevFalse=<i>&laquo;$\:form.task.without.preview&raquo;</i>
 chelp.prevTrue=<i>&laquo;$\:form.task.with.preview&raquo;</i>
 chelp.scoring=<b>$\:pane.tab.conf.scoring</b>
 chelp.sel1=\u4F60\u53EF\u4EE5\u51B3\u5B9A\u4F7F\u7528\u8BFE\u7A0B\u5143\u7D20$\:chelp.taskNode\u7684\u5B50\u5143\u7D20$\:chelp.task, $\:chelp.dropbox \u6216$\:chelp.scoring\u4E2D\u7684\u54EA\u4E2A\u5B50\u5143\u7D20.\u5982\u679C\u4F60\u6CA1\u6709\u4F5C\u51FA\u9009\u62E9,\u6240\u6709\u5B50\u5143\u7D20\u90FD\u4F1A\u88AB\u6FC0\u6D3B.\u5982\u679C\u4F60\u5220\u9664\u4E00\u4E2A\u6216\u8005\u4E24\u4E2A\u5B50\u5143\u7D20\u548C\u5B83\u7684\u8BBE\u7F6E,\u76F8\u5173\u7684\u6807\u7B7E\u4E0D\u80FD\u518D\u88AB\u9009\u62E9,\u5B83\u4E0D\u80FD\u80FD\u88AB\u6FC0\u6D3B.
-chelp.sel2=\u4F60\u5FC5\u987B\u81F3\u5C11\u9009\u62E9\u4E00\u4E2A\u5B50\u5143\u7D20.
 chelp.sol1=\u5728\u8FD9\u91CC\u60A8\u53EF\u4EE5\u5728$\:chelp.linkSol \u89E3\u7B54\u793A\u4F8B\u5F00\u653E\u6587\u4EF6\u5939 \u4E3A\u60A8\u7684\u5B66\u7A0B\u53C2\u52A0\u8005\u63D0\u4F9B\u7B54\u6848\u793A\u4F8B\u3002
 chelp.solution=<b>$\:pane.tab.solution</b>
 chelp.task=<b>$\:pane.tab.conf.task</b>
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_zh_TW.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_zh_TW.properties
index d758cd4f1b049e3cc1022fd625d54d2e4e0cfbe9..7b8b4cc525a9272159643a1eeff5fffc0df046b1 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_zh_TW.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/LocalStrings_zh_TW.properties
@@ -1,4 +1,4 @@
-#Fri Sep 17 15:50:56 CEST 2010
+#Wed Nov 04 23:38:15 CET 2015
 conf.continue=\u56DE\u5230\u6982\u89C0
 conf.mail.error=\u9019\u500B\u78BA\u8A8D\u6253\u7B97\u8981\u767C\u9001\u96FB\u5B50\u90F5\u4EF6\u3002\u7136\u800C\uFF0C\u767C\u9001\u96FB\u5B50\u90F5\u4EF6\u5931\u6557\u3002\u5F37\u70C8\u5EFA\u8B70\u60A8\u5217\u5370\u9019\u500B\u78BA\u8A8D\u756B\u9762\u4F5C\u70BA\u60A8\u7684\u7D00\u9304\u3002
 conf.mail.sent=\u9019\u500B\u78BA\u8A8D\u5DF2\u7528\u96FB\u5B50\u90F5\u4EF6\u767C\u9001\u5230\u5730\u5740 {0}\u3002
diff --git a/src/main/java/org/olat/course/nodes/ta/_i18n/i18nBundleMetadata.properties b/src/main/java/org/olat/course/nodes/ta/_i18n/i18nBundleMetadata.properties
index 2bea24291d651eb4ab4a4b8a826b96d6f2f70e09..c133305a97a58054ab1acd9730b492c861e28405 100644
--- a/src/main/java/org/olat/course/nodes/ta/_i18n/i18nBundleMetadata.properties
+++ b/src/main/java/org/olat/course/nodes/ta/_i18n/i18nBundleMetadata.properties
@@ -1 +1,2 @@
+#Wed Nov 04 23:38:14 CET 2015
 title_ta.inlinetranslation=disabled
diff --git a/src/main/java/org/olat/gui/demo/guidemo/GuiDemoFlexiFormAdvancedController.java b/src/main/java/org/olat/gui/demo/guidemo/GuiDemoFlexiFormAdvancedController.java
index 3d8942e4e47aaba056669b4418871ccee84d1d8d..e8802d655fb2531c278f18f8368c83280c036661 100644
--- a/src/main/java/org/olat/gui/demo/guidemo/GuiDemoFlexiFormAdvancedController.java
+++ b/src/main/java/org/olat/gui/demo/guidemo/GuiDemoFlexiFormAdvancedController.java
@@ -98,10 +98,9 @@ public class GuiDemoFlexiFormAdvancedController extends FormBasicController {
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		setFormTitle("guidemo_flexi_form_advanced");
 		setFormDescription("advanced_form.description");
-		// setFormContextHelp(this.getClass().getPackage().getName(),
-		// "advancedFormHelp", "advanced_form.description");
-		// Mandatory and read-only text fields
-		
+		setFormContextHelp("Introduction");
+
+		// Mandatory and read-only text fields		
 		this.addTextFields(formLayout);
 
 		// More form items: Date, link and file selector
diff --git a/src/main/java/org/olat/gui/demo/guidemo/GuiDemoFlexiFormSubworkflow.java b/src/main/java/org/olat/gui/demo/guidemo/GuiDemoFlexiFormSubworkflow.java
index db584129e4f7ed4c235a0dc2703d6eea1911b1e3..9bee11c92d548b474f07b0f95b926d214216d30a 100644
--- a/src/main/java/org/olat/gui/demo/guidemo/GuiDemoFlexiFormSubworkflow.java
+++ b/src/main/java/org/olat/gui/demo/guidemo/GuiDemoFlexiFormSubworkflow.java
@@ -165,7 +165,7 @@ public class GuiDemoFlexiFormSubworkflow extends FormBasicController {
 		// Example2: Set a form description above the form
 		setFormDescription("guidemo_flexi_form_withchooser.desc");
 		// Example3: Set a context help link
-		setFormContextHelp("org.olat.core.commons.modules.bc", "bc-webdav.html", "guidemo_flexi_form_withchooser.helphover");		
+		setFormContextHelp("Folders#Folders-MetaData");		
 		
 		final boolean inputMode = !personData.isReadOnly();
 		
diff --git a/src/main/java/org/olat/modules/openmeetings/ui/OpenMeetingsRoomEditController.java b/src/main/java/org/olat/modules/openmeetings/ui/OpenMeetingsRoomEditController.java
index 7268e1142ae0fbbc7f737d5cf634e789e21456ae..f1cd18276ab92c9e46efb001176fba6a0f600de9 100644
--- a/src/main/java/org/olat/modules/openmeetings/ui/OpenMeetingsRoomEditController.java
+++ b/src/main/java/org/olat/modules/openmeetings/ui/OpenMeetingsRoomEditController.java
@@ -136,7 +136,7 @@ public class OpenMeetingsRoomEditController extends FormBasicController {
 
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
-		setFormContextHelp(this.getClass().getPackage().getName(), "room.html", "help.hover.openmeetings.room");
+		setFormContextHelp("Communication and Collaboration#CommunicationandCollaboration-_openmeeting_raum");
 		
 		String name = room == null ? (defaultSettings == null ? null : defaultSettings.getName()) : room.getName();
 		roomNameEl = uifactory.addTextElement("roomname", "room.name", 255, name == null ? "" : name, formLayout);
diff --git a/src/main/java/org/olat/portfolio/ui/artefacts/collect/EPCollectStepForm03.java b/src/main/java/org/olat/portfolio/ui/artefacts/collect/EPCollectStepForm03.java
index 9486bafde8cf6fc27ca4e83dccc5126b754f94b8..7af3fa7c91704901dfa84d6f3d78080f8b1a84e9 100644
--- a/src/main/java/org/olat/portfolio/ui/artefacts/collect/EPCollectStepForm03.java
+++ b/src/main/java/org/olat/portfolio/ui/artefacts/collect/EPCollectStepForm03.java
@@ -131,7 +131,7 @@ public class EPCollectStepForm03 extends StepFormBasicController {
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		setFormDescription("step3.short.descr");
-		setFormContextHelp("Personal Menu#");
+		setFormContextHelp("Personal Menu");
 
 		if (showNoReflexionOnStructLinkYetWarning) {
 			uifactory.addStaticTextElement("hint", "info.no.reflexion.yet", "", formLayout);
diff --git a/src/main/java/org/olat/search/ui/SearchInputController.java b/src/main/java/org/olat/search/ui/SearchInputController.java
index efdc053bd5460481b0bde36d0a55a1484768df29..e9bff5e9b8f5bb4692cc6a9cc8fd2c7ca7d89acf 100644
--- a/src/main/java/org/olat/search/ui/SearchInputController.java
+++ b/src/main/java/org/olat/search/ui/SearchInputController.java
@@ -445,12 +445,6 @@ public class SearchInputController extends FormBasicController implements Generi
 			if(!StringHelper.containsNonWhitespace(url)) {
 				//no url, no document
 				getWindowControl().setWarning(getTranslator().translate("error.resource.could.not.found"));
-			} else if(url != null && url.startsWith("[ContextHelpModule:")) {
-				//do something special for ContextHelp
-				int pathIndex = url.indexOf("path=");
-				String uri = url.substring(pathIndex + 5, url.length() - 1);
-				RedirectMediaResource rsrc = new RedirectMediaResource(uri);
-				ureq.getDispatchResult().setResultingMediaResource(rsrc);
 			} else {
 				BusinessControl bc = BusinessControlFactory.getInstance().createFromString(url);
 			  WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(bc, getWindowControl());
diff --git a/src/main/java/org/olat/search/ui/_i18n/LocalStrings_ar.properties b/src/main/java/org/olat/search/ui/_i18n/LocalStrings_ar.properties
index 0e2cf7ef6ed21d94cc8c2ef4aecd3a12d1fe3f0a..4e87837636aace24eef891aed777870bc4dba583 100644
--- a/src/main/java/org/olat/search/ui/_i18n/LocalStrings_ar.properties
+++ b/src/main/java/org/olat/search/ui/_i18n/LocalStrings_ar.properties
@@ -114,7 +114,7 @@ switch.simple.search=\u0627\u0644\u0628\u062D\u062B \u0627\u0644\u0628\u0633\u06
 too.many.results=\u062A\u0645 \u0627\u0644\u0639\u062B\u0648\u0631 \u0639\u0644\u0649 \u0646\u062A\u0627\u0626\u062C \u0643\u062B\u064A\u0631\u0629 \u062C\u062F\u0627\u064B\u060C \u0633\u064A\u062A\u0645 \u0639\u0631\u0636 \u0627\u0644\u0646\u062A\u0627\u0626\u062C {0} \u0627\u0644\u0623\u0648\u0644\u0649 \u0641\u0642\u0637.
 toolfolder=\u0645\u062C\u0644\u062F
 toolforum=\u0645\u0646\u062A\u062F\u064A\u0627\u062A
-type.contexthelp=\u0645\u0633\u0627\u0639\u062F\u0629 \u0627\u0644\u0633\u064A\u0627\u0642 \u0627\u0644\u062F\u0642\u064A\u0642
+
 type.course.node=\u0639\u0646\u0635\u0631 \u0627\u0644\u0645\u0642\u0631\u0631
 type.course.node.bc=\u0639\u0646\u0635\u0631 \u0627\u0644\u0645\u0642\u0631\u0631\u060C \u0627\u0644\u0645\u062C\u0644\u062F
 type.course.node.blog=\u0639\u0646\u0635\u0631 \u0627\u0644\u0645\u0642\u0631\u0631\u060C \u0627\u0644\u0645\u062F\u0648\u0646\u0629
diff --git a/src/main/java/org/olat/search/ui/_i18n/LocalStrings_bg.properties b/src/main/java/org/olat/search/ui/_i18n/LocalStrings_bg.properties
index 5b4f0843b37f3ec2d7573a4e4eeaf45a1080b2f4..36e81c08a6d76f625d4f98dca78bed3162bc9fd6 100644
--- a/src/main/java/org/olat/search/ui/_i18n/LocalStrings_bg.properties
+++ b/src/main/java/org/olat/search/ui/_i18n/LocalStrings_bg.properties
@@ -101,7 +101,7 @@ search.title=\u0422\u044A\u0440\u0441\u0435\u043D\u0435 \u0432 \u0446\u0435\u043
 switch.advanced.search=\u0422\u044A\u0440\u0441\u0435\u043D\u0435 \u0437\u0430 \u043D\u0430\u043F\u0440\u0435\u0434\u043D\u0430\u043B\u0438
 switch.simple.search=\u041E\u0431\u0438\u043A\u043D\u043E\u0432\u0435\u043D\u043E \u0442\u044A\u0440\u0441\u0435\u043D\u0435
 too.many.results=\u041D\u0430\u043C\u0435\u0440\u0435\u043D\u0438 \u0441\u0430 \u0442\u0432\u044A\u0440\u0434\u0435 \u043C\u043D\u043E\u0433\u043E \u0440\u0435\u0437\u0443\u043B\u0442\u0430\u0442\u0438. \u0421\u0430\u043C\u043E \u043F\u044A\u0440\u0432\u0438\u0442\u0435 {0} \u0441\u0430 \u043F\u043E\u043A\u0430\u0437\u0430\u043D\u0438.
-type.contexthelp=\u041A\u043E\u043D\u0442\u0435\u043A\u0441\u0442\u0443\u0430\u043B\u043D\u043E-\u0447\u0443\u0432\u0441\u0442\u0432\u0438\u0442\u0435\u043B\u043D\u0430 \u041F\u043E\u043C\u043E\u0449
+
 type.course.node=\u041A\u0443\u0440\u0441\u043E\u0432 \u0435\u043B\u0435\u043C\u0435\u043D\u0442
 type.course.node.bc=\u041A\u0443\u0440\u0441\u043E\u0432 \u0435\u043B\u0435\u043C\u0435\u043D\u0442, \u043F\u0430\u043F\u043A\u0430
 type.course.node.cp=\u041A\u0443\u0440\u0441\u043E\u0432 \u0435\u043B\u0435\u043C\u0435\u043D\u0442, CP \u0443\u0447\u0435\u0431\u043D\u043E \u0441\u044A\u0434\u044A\u0440\u0436\u0430\u043D\u0438\u0435
diff --git a/src/main/java/org/olat/search/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/search/ui/_i18n/LocalStrings_de.properties
index 0839e23392b6cfe9169d24ac1a022ba636e0c87c..af41660eafd67885a3fd4d12043e932f233cf5fb 100644
--- a/src/main/java/org/olat/search/ui/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/search/ui/_i18n/LocalStrings_de.properties
@@ -116,7 +116,7 @@ switch.simple.search=Einfache Suche
 too.many.results=Es wurden zuviele Resultate gefunden. Es werden nur die ersten {0} angezeigt.
 toolfolder=Ordner
 toolforum=Foren
-type.contexthelp=Kontextsensitive Hilfe
+
 type.course.node=Kursbaustein
 type.course.node.bc=Kursbaustein, Ordner
 type.course.node.cp=Kursbaustein, CP-Lerninhalt
diff --git a/src/main/java/org/olat/search/ui/_i18n/LocalStrings_el.properties b/src/main/java/org/olat/search/ui/_i18n/LocalStrings_el.properties
index 4354ae23bfe2ca4710b6ddf4caf0116c4e5999e1..0a8121224adc892e5fc563740b48ca75af15ba47 100644
--- a/src/main/java/org/olat/search/ui/_i18n/LocalStrings_el.properties
+++ b/src/main/java/org/olat/search/ui/_i18n/LocalStrings_el.properties
@@ -109,7 +109,7 @@ switch.simple.search=\u0391\u03C0\u03BB\u03AE \u03B1\u03BD\u03B1\u03B6\u03AE\u03
 too.many.results=\u039C\u03B5\u03B3\u03AC\u03BB\u03BF\u03C2 \u03B1\u03C1\u03B9\u03B8\u03BC\u03CC\u03C2 \u03B1\u03C0\u03BF\u03C4\u03B5\u03BB\u03B5\u03C3\u03BC\u03AC\u03C4\u03C9\u03BD. \u039C\u03CC\u03BD\u03B1 \u03C4\u03B1 \u03C0\u03C1\u03CE\u03C4\u03B1 {0} \u03B5\u03BC\u03C6\u03B1\u03BD\u03AF\u03B6\u03BF\u03BD\u03C4\u03B1\u03B9.
 toolfolder=\u03A6\u03AC\u03BA\u03B5\u03BB\u03BF\u03C2
 toolforum=Forum
-type.contexthelp=\u0392\u03BF\u03AE\u03B8\u03B5\u03B9\u03B1 \u03B3\u03B9\u03B1 \u03C4\u03B7\u03BD \u03B5\u03C5\u03B1\u03B9\u03C3\u03B8\u03B7\u03C3\u03AF\u03B1 \u03C3\u03C4\u03BF \u03C0\u03B5\u03C1\u03B9\u03B5\u03C7\u03CC\u03BC\u03B5\u03BD\u03BF
+
 type.course.node=\u03A3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03BF \u03BC\u03B1\u03B8\u03AE\u03BC\u03B1\u03C4\u03BF\u03C2
 type.course.node.bc=\u03A3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03BF \u03BC\u03B1\u03B8\u03AE\u03BC\u03B1\u03C4\u03BF\u03C2, \u03C6\u03AC\u03BA\u03B5\u03BB\u03BF\u03C2 
 type.course.node.blog=\u03A3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03BF \u03BC\u03B1\u03B8\u03AE\u03BC\u03B1\u03C4\u03BF\u03C2, blog
diff --git a/src/main/java/org/olat/search/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/search/ui/_i18n/LocalStrings_en.properties
index 88520928dd106a9e5cd4d68f4234e5aef2a60ff6..d1ff4a1298f213f21bbd3c8fe758db2a5ab406b0 100644
--- a/src/main/java/org/olat/search/ui/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/search/ui/_i18n/LocalStrings_en.properties
@@ -119,7 +119,7 @@ switch.simple.search=Simple search
 too.many.results=Too many results found. Only the first {0} will be displayed.
 toolfolder=Folder
 toolforum=Forums
-type.contexthelp=Context-sensitive Help
+
 type.course.node=Course element
 type.course.node.bc=Course element, folder
 type.course.node.blog=Course element, blog
diff --git a/src/main/java/org/olat/search/ui/_i18n/LocalStrings_es.properties b/src/main/java/org/olat/search/ui/_i18n/LocalStrings_es.properties
index e3c8a46c4c2c129876beb90925517e84ee291a3c..399c5716439d3c30a1813cd4de49f05217b10b43 100644
--- a/src/main/java/org/olat/search/ui/_i18n/LocalStrings_es.properties
+++ b/src/main/java/org/olat/search/ui/_i18n/LocalStrings_es.properties
@@ -100,7 +100,7 @@ search.title=B\u00FAsqueda en OLAT
 switch.advanced.search=B\u00FAsqueda avanzada
 switch.simple.search=B\u00FAsqueda simple
 too.many.results=Demasiados resultados encontrado. Solamente se exhiben los primeros {0} resultados.
-type.contexthelp=Ayuda sensible a contexto
+
 type.course.node=Elemento del curso
 type.course.node.bc=Elemento del curso\: carpeta
 type.course.node.cp=Elemento del curso\: contenido did\u00E1ctico CP
diff --git a/src/main/java/org/olat/search/ui/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/search/ui/_i18n/LocalStrings_fr.properties
index f27d67ae3a935a246900bbc01e09edd3d31f52cc..8354117ad3792e2a7963f471c1c1ac54b5f7297b 100644
--- a/src/main/java/org/olat/search/ui/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/search/ui/_i18n/LocalStrings_fr.properties
@@ -119,7 +119,7 @@ switch.simple.search=Recherche simple
 too.many.results=Trop de r\u00E9sultats ont \u00E9t\u00E9 trouv\u00E9s. Uniquement les {0} premiers sont affich\u00E9s.
 toolfolder=Dossier
 toolforum=Forum
-type.contexthelp=Aide contextuelle
+
 type.course.node=El\u00E9ment de cours
 type.course.node.bc=El\u00E9ment de cours, dossier 
 type.course.node.blog=El\u00E9ment de cours, blog
diff --git a/src/main/java/org/olat/search/ui/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/search/ui/_i18n/LocalStrings_it.properties
index bd2347ceeab09ec16a0c27092fb37799266d3f0e..cd1ef345c5a48137c964a43dabb71913f9694e90 100644
--- a/src/main/java/org/olat/search/ui/_i18n/LocalStrings_it.properties
+++ b/src/main/java/org/olat/search/ui/_i18n/LocalStrings_it.properties
@@ -115,7 +115,7 @@ switch.simple.search=Ricerca semplice
 too.many.results=Sono stati trovati troppi risultati. Vengono mostrati solo i primi {0}.
 toolfolder=Cartella
 toolforum=Forum
-type.contexthelp=Aiuto contestuale
+
 type.course.node=Elemento di corso
 type.course.node.bc=Elemento di corso, cartella
 type.course.node.blog=Elemento di corso, blog
diff --git a/src/main/java/org/olat/search/ui/_i18n/LocalStrings_nl_NL.properties b/src/main/java/org/olat/search/ui/_i18n/LocalStrings_nl_NL.properties
index 425ffb4e642f36f6f6b090100830d11a74087daa..2f2d08bf30c26ce11fe56de456afd587cf91a813 100644
--- a/src/main/java/org/olat/search/ui/_i18n/LocalStrings_nl_NL.properties
+++ b/src/main/java/org/olat/search/ui/_i18n/LocalStrings_nl_NL.properties
@@ -115,7 +115,7 @@ switch.simple.search=Simpele zoeking
 too.many.results=Te veel resultaten gevonden. Enkel de eerste {0} zullen getoond worden.
 toolfolder=Map
 toolforum=Forums
-type.contexthelp=Context-gevoelige hulp
+
 type.course.node=Cursuselement
 type.course.node.bc=Cursuselement, map
 type.course.node.blog=Cursuselement, blog
diff --git a/src/main/java/org/olat/search/ui/_i18n/LocalStrings_pl.properties b/src/main/java/org/olat/search/ui/_i18n/LocalStrings_pl.properties
index 88761d8fe5e63f097de66eaa21f379f03ca6053d..ffed664a9a6ef879f718ffc25459a64bc010a65b 100644
--- a/src/main/java/org/olat/search/ui/_i18n/LocalStrings_pl.properties
+++ b/src/main/java/org/olat/search/ui/_i18n/LocalStrings_pl.properties
@@ -82,7 +82,7 @@ switch.simple.search=Proste wyszukiwanie
 too.many.results=Znaleziono wiele wynik\u00F3w. Tylko pierwsze {0} wynik\u00F3w jest wy\u015Bwietlonych.
 toolfolder=Folder
 toolforum=Fora
-type.contexthelp=Pomoc kontekstowa
+
 type.course.node=Element kursu
 type.course.node.bc=Element kursu - Folder
 type.course.node.blog=Element kursu, Blog
diff --git a/src/main/java/org/olat/search/ui/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/search/ui/_i18n/LocalStrings_pt_BR.properties
index 7234f57cf731beff69fe035e29109fa1b627f76d..a16c2c6103fe9d01a3c1f16f2ecf1ad50ac44383 100644
--- a/src/main/java/org/olat/search/ui/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/search/ui/_i18n/LocalStrings_pt_BR.properties
@@ -119,7 +119,7 @@ switch.simple.search=Busca simples
 too.many.results=Muitos resultados encontrados. Somente os primeiros {0} s\u00E3o exibidos.
 toolfolder=Pasta
 toolforum=F\u00F3rums
-type.contexthelp=Context-sensitive Help
+
 type.course.node=Elemento de curso
 type.course.node.bc=Pasta do elemento de curso
 type.course.node.blog=Elemento de Curso, blog
diff --git a/src/main/java/org/olat/search/ui/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/search/ui/_i18n/LocalStrings_zh_CN.properties
index 77ef58ea590384a3073d46997d5981752401129b..afad7e132633e06d1adea9c8f8e26fd59cde0336 100644
--- a/src/main/java/org/olat/search/ui/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/search/ui/_i18n/LocalStrings_zh_CN.properties
@@ -113,7 +113,7 @@ switch.simple.search=\u7B80\u5355\u641C\u7D22
 too.many.results=\u67E5\u8BE2\u7ED3\u679C\u8FC7\u591A\uFF0C\u53EA\u663E\u793A\u7B2C\u4E00\u4E2A{0} \u3002
 toolfolder=\u6587\u4EF6\u5939
 toolforum=\u8BBA\u575B
-type.contexthelp=\u5185\u5BB9\u654F\u611F\u5EA6\u5E2E\u52A9
+
 type.course.node=\u8BFE\u7A0B\u5143\u7D20
 type.course.node.bc=\u8BFE\u7A0B\u5143\u7D20\u6587\u4EF6\u5939
 type.course.node.blog=\u5B66\u7A0B\u5143\u7D20\uFF0C\u535A\u5BA2
diff --git a/src/main/java/org/olat/search/ui/_i18n/LocalStrings_zh_TW.properties b/src/main/java/org/olat/search/ui/_i18n/LocalStrings_zh_TW.properties
index 12f1f3afd72ca445a6ba0ac1460ab82363530626..2b4bc46fbd67d759e59b3d7b3575a773e3c3a3a8 100644
--- a/src/main/java/org/olat/search/ui/_i18n/LocalStrings_zh_TW.properties
+++ b/src/main/java/org/olat/search/ui/_i18n/LocalStrings_zh_TW.properties
@@ -83,7 +83,7 @@ search.title=\u5168\u6587\u6AA2\u7D22
 switch.advanced.search=\u9032\u968E\u641C\u5C0B
 switch.simple.search=\u7C21\u55AE\u641C\u5C0B
 too.many.results=\u627E\u5230\u592A\u591A\u7D50\u679C\u3002\u53EA\u6709\u986F\u793A\u524D {0} \u7B46\u3002
-type.contexthelp=\u5167\u6587\u76F8\u95DC\u8AAA\u660E
+
 type.course.node=\u8AB2\u7A0B\u5143\u7D20
 type.course.node.bc=\u8AB2\u7A0B\u5143\u7D20\uFF0C\u8CC7\u6599\u593E
 type.course.node.cp=\u8AB2\u7A0B\u5143\u7D20\uFF0CCP \u5B78\u7FD2\u5167\u5BB9