diff --git a/src/main/java/org/olat/core/gui/control/generic/textmarker/GlossaryMarkupItemController.java b/src/main/java/org/olat/core/gui/control/generic/textmarker/GlossaryMarkupItemController.java
index 89bc1e0b41b105cc39b5664499b5372d6a90d847..183d80c6bfd553304bc2ca2d44c328945765191c 100644
--- a/src/main/java/org/olat/core/gui/control/generic/textmarker/GlossaryMarkupItemController.java
+++ b/src/main/java/org/olat/core/gui/control/generic/textmarker/GlossaryMarkupItemController.java
@@ -96,7 +96,7 @@ public class GlossaryMarkupItemController extends BasicController {
 		
 		tmContainer.contextPut("glossaryId", glossaryId);
 
-			// finally add the wrapped content to the velocity container
+		// finally add the wrapped content to the velocity container
 		tmContainer.put("tmComponent", tmComponent);
 		putInitialPanel(tmContainer);		
 	}
@@ -127,8 +127,7 @@ public class GlossaryMarkupItemController extends BasicController {
 	 */
 	@Override
 	protected void doDispose() {
-	// TODO Auto-generated method stub
-
+		//
 	}
 
 	/**
@@ -136,8 +135,6 @@ public class GlossaryMarkupItemController extends BasicController {
 	 */
 	@Override
 	protected void event(UserRequest ureq, Component source, Event event) {
-	// TODO Auto-generated method stub
-
+		//
 	}
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/org/olat/gui/demo/_spring/guiDemoContext.xml b/src/main/java/org/olat/gui/demo/_spring/guiDemoContext.xml
index 74c640a75d3b6f205cacfafb93fd1853ef4238c7..4cdd968be1f80a461af574a4c71a79e048a5bf36 100644
--- a/src/main/java/org/olat/gui/demo/_spring/guiDemoContext.xml
+++ b/src/main/java/org/olat/gui/demo/_spring/guiDemoContext.xml
@@ -136,20 +136,6 @@
 			<property name="order" value="21" />
 		</bean>
 		
-		<bean class="org.olat.core.extensions.action.GenericActionExtension" init-method="initExtensionPoints">
-			<property name="actionController">	
-				<bean class="org.olat.core.gui.control.creator.AutoCreator" scope="prototype">
-					<property name="className" value="org.olat.gui.demo.guidemo.GuiDemoTextMarkerController"/>
-				</bean>
-			</property>
-			<property name="extensionPoints">
-				<list>	
-					<value>org.olat.gui.demo.GUIDemoMainController</value>		
-				</list>
-			</property>
-			<property name="order" value="22" />
-		</bean>
-		
 		<bean class="org.olat.core.extensions.action.GenericActionExtension" init-method="initExtensionPoints">
 			<property name="actionController">	
 				<bean class="org.olat.core.gui.control.creator.AutoCreator" scope="prototype">
diff --git a/src/main/java/org/olat/gui/demo/guidemo/GuiDemoTextMarkerController.java b/src/main/java/org/olat/gui/demo/guidemo/GuiDemoTextMarkerController.java
deleted file mode 100644
index ddb7a201ec91420b9d6ee57f3e9d1c3e59598858..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/gui/demo/guidemo/GuiDemoTextMarkerController.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <hr>
-* <a href="http://www.openolat.org">
-* OpenOLAT - Online Learning and Training</a><br>
-* This file has been modified by the OpenOLAT community. Changes are licensed
-* under the Apache 2.0 license as the original file.
-*/
-
-package org.olat.gui.demo.guidemo;
-
-import java.io.IOException;
-
-import org.olat.core.gui.UserRequest;
-import org.olat.core.gui.components.Component;
-import org.olat.core.gui.components.velocity.VelocityContainer;
-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.gui.control.generic.textmarker.GlossaryMarkupItemController;
-import org.olat.core.util.vfs.LocalFolderImpl;
-import org.olat.modules.glossary.GlossaryManager;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-
-/**
- * 
- * Description: Loads a test textmarker file and applies it to the content of
- * the html file
- * 
- * @author gnaegi Initial Date: Jul 14, 2006
- * 
- */
-public class GuiDemoTextMarkerController extends BasicController {
-
-	VelocityContainer vcMain;
-	GlossaryMarkupItemController glossCtr;
-
-	public GuiDemoTextMarkerController(UserRequest ureq, WindowControl wControl) {
-		super(ureq, wControl);
-
-		vcMain = createVelocityContainer("guidemo-textmarker");
-		Resource resource = new ClassPathResource("/org/olat/gui/demo/_static/"+GlossaryManager.INTERNAL_FOLDER_NAME);
-		String glossaryId = "guiDemoTestGlossary";
-		try {
-			glossCtr = new GlossaryMarkupItemController(ureq, getWindowControl(), vcMain, new LocalFolderImpl(resource.getFile()), glossaryId);
-		} catch (IOException e) {
-			showInfo("GuiDemoTextMarkerController.notWorking");
-		}
-		glossCtr.setTextMarkingEnabled(false);
-		putInitialPanel(glossCtr.getInitialComponent());
-	}
-
-	/**
-	 * @see org.olat.core.gui.control.DefaultController#event(org.olat.core.gui.UserRequest,
-	 *      org.olat.core.gui.components.Component,
-	 *      org.olat.core.gui.control.Event)
-	 */
-	public void event(UserRequest ureq, Component source, Event event) {
-	// nothing to catch
-	}
-
-	/**
-	 * @see org.olat.core.gui.control.DefaultController#doDispose(boolean)
-	 */
-	protected void doDispose() {
-		if (glossCtr != null) {
-			glossCtr.dispose();
-			glossCtr = null;
-		}
-	}
-
-}
diff --git a/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_ar.properties b/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_ar.properties
index 73861878aada2a741b81d1a541ce8ea34394b77f..f9fd080704fc1b907a0caf128873a20865685013 100644
--- a/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_ar.properties
+++ b/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_ar.properties
@@ -27,9 +27,6 @@ GuiDemoStepsRunner.menu.title=\u0627\u0644\u062E\u0637\u0648\u0627\u062A
 GuiDemoStepsRunner.menu.title.alt=\u0645\u0639\u0627\u0644\u062C \u062C\u062F\u064A\u062F
 GuiDemoTablesController.menu.title=\u0627\u0644\u062C\u062F\u0627\u0648\u0644
 GuiDemoTablesController.menu.title.alt=\u062A\u0648\u0636\u064A\u062D \u0627\u0644\u062C\u062F\u0627\u0648\u0644
-GuiDemoTextMarkerController.menu.title=\u0627\u0644\u0642\u0627\u0645\u0648\u0633 \u0648\u0627\u0644\u0639\u0644\u0627\u0645\u0629
-GuiDemoTextMarkerController.menu.title.alt=\u062A\u0648\u0636\u064A\u062D \u0639\u0644\u0627\u0645\u0629 \u0627\u0644\u0646\u0635 \u0648\u0645\u064A\u0632\u0629 \u0627\u0644\u0642\u0627\u0645\u0648\u0633
-GuiDemoTextMarkerController.notWorking=\u062E\u0627\u0635\u064A\u0629 \u0627\u0644\u062A\u0648\u0636\u064A\u062D \u0644\u0627 \u062A\u0639\u0645\u0644 \u0641\u0649 \u0627\u0644\u0648\u0642\u062A \u0627\u0644\u062D\u0627\u0644\u0649\u060C \u0627\u0633\u062A\u062E\u062F\u0645 \u0627\u0644\u0642\u0627\u0645\u0648\u0633 \u0641\u0649 \u0627\u0644\u0645\u0642\u0631\u0631.
 GuiDemoTooltipsController.menu.title=Tooltips based on Extjs library
 GuiDemoTooltipsController.menu.title.alt=Demonstrates the tooltips in various flavours
 GuiDemoWindowControlController.menu.title=\u062A\u062D\u0643\u0645 \u0627\u0644\u0646\u0627\u0641\u0630\u0629
diff --git a/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_bg.properties b/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_bg.properties
index a70c35a4c3830084411419dc42afa46763319888..1cc4958216f7a6c84df2e7a961a8ad781506e976 100644
--- a/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_bg.properties
+++ b/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_bg.properties
@@ -27,9 +27,6 @@ GuiDemoStepsRunner.menu.title=\u0421\u0442\u044A\u043F\u043A\u0438
 GuiDemoStepsRunner.menu.title.alt=\u041D\u043E\u0432 \u0410\u0441\u0438\u0441\u0442\u0435\u043D\u0442
 GuiDemoTablesController.menu.title=\u0422\u0430\u0431\u043B\u0438\u0446\u0438
 GuiDemoTablesController.menu.title.alt=\u0414\u0435\u043C\u043E\u043D\u0441\u0442\u0440\u0438\u0440\u0430 \u0422\u0430\u0431\u043B\u0438\u0446\u0438\u0442\u0435
-GuiDemoTextMarkerController.menu.title=\u0420\u0435\u0447\u043D\u0438\u043A \u0438 \u043C\u0430\u0440\u043A\u0435\u0440
-GuiDemoTextMarkerController.menu.title.alt=\u0414\u0435\u043C\u043E\u043D\u0441\u0442\u0440\u0438\u0440\u0430 \u0442\u0435\u043A\u0441\u0442\u043E\u0432 \u043C\u0430\u0440\u043A\u0435\u0440 \u0438 \u0445\u0430\u0440\u0430\u043A\u0442\u0435\u0440\u0438\u0441\u0442\u0438\u043A\u0430 \u043D\u0430 \u0440\u0435\u0447\u043D\u0438\u043A\u0430
-GuiDemoTextMarkerController.notWorking=\u041C\u0430\u0440\u043A\u0438\u0440\u0430\u043D\u0435\u0442\u043E \u043D\u0435 \u0440\u0430\u0431\u043E\u0442\u0438 \u043A\u0430\u0442\u043E \u0441\u0430\u043C\u043E\u0441\u0442\u043E\u044F\u0442\u0435\u043B\u0435\u043D \u043C\u043E\u0434\u0443\u043B \u0432 \u043C\u043E\u043C\u0435\u043D\u0442\u0430. \u0418\u0437\u043F\u043E\u043B\u0437\u0432\u0430\u0439\u0442\u0435 \u0440\u0435\u0447\u043D\u0438\u043A\u0430 \u0441 \u0442\u0435\u0440\u043C\u0438\u043D\u0438 \u043D\u0430 \u043A\u0443\u0440\u0441\u0430.
 GuiDemoTooltipsController.menu.title=\u0411\u0430\u043B\u043E\u043D\u043D\u0438 \u043C\u0435\u043D\u044E\u0442\u0430 \u0431\u0430\u0437\u0438\u0440\u0430\u043D\u0438 \u043D\u0430 Extjs \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0430
 GuiDemoTooltipsController.menu.title.alt=\u0414\u0435\u043C\u043E\u043D\u0441\u0442\u0440\u0438\u0440\u0430 \u0440\u0430\u0437\u043B\u0438\u0447\u043D\u0438 \u0431\u0430\u043B\u043E\u043D\u043D\u0438 \u043C\u0435\u043D\u044E\u0442\u0430
 GuiDemoWindowControlController.menu.title=\u041A\u043E\u043D\u0442\u0440\u043E\u043B \u043D\u0430 \u041F\u0440\u043E\u0437\u043E\u0440\u0435\u0446
diff --git a/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_de.properties
index b5cf87fe1494d3e0f9ef4d931caaf484260870bc..53c32bf67c14831421a8af1a6e80ed7caa4655a9 100644
--- a/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_de.properties
@@ -27,9 +27,6 @@ GuiDemoStepsRunner.menu.title=Steps
 GuiDemoStepsRunner.menu.title.alt=New Wizard
 GuiDemoTablesController.menu.title=Tables
 GuiDemoTablesController.menu.title.alt=Demonstrates Tables
-GuiDemoTextMarkerController.menu.title=Glossar and marker
-GuiDemoTextMarkerController.menu.title.alt=Demonstrates the text marker and glossar feature
-GuiDemoTextMarkerController.notWorking=Das Highlighting funktioniert zur Zeit nur noch im Rahmen einer Resource (Kurs). 
 GuiDemoIconsController.menu.title=Icons
 GuiDemoIconsController.menu.title.alt=Icons Demonstration
 GuiDemoTooltipsController.menu.title=Tooltips based on Extjs library
diff --git a/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_el.properties b/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_el.properties
index 00629197f3d002420c0f339c57ecb04aeda02d9c..7dbd9d663d189268f345d4f5f2abd305124b7aa6 100644
--- a/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_el.properties
+++ b/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_el.properties
@@ -27,9 +27,6 @@ GuiDemoStepsRunner.menu.title=\u0392\u03AE\u03BC\u03B1\u03C4\u03B1
 GuiDemoStepsRunner.menu.title.alt=\u039D\u03AD\u03BF\u03C2 \u039F\u03B4\u03B7\u03B3\u03CC\u03C2
 GuiDemoTablesController.menu.title=\u03A0\u03AF\u03BD\u03B1\u03BA\u03B5\u03C2
 GuiDemoTablesController.menu.title.alt=\u0395\u03BC\u03C6\u03AC\u03BC\u03B9\u03C3\u03B7 \u03A0\u03B9\u03BD\u03AC\u03BA\u03C9\u03BD
-GuiDemoTextMarkerController.menu.title=\u0393\u03BB\u03C9\u03C3\u03C3\u03AC\u03C1\u03B9\u03BF \u03BA\u03B1\u03B9 \u03A3\u03B7\u03BC\u03B5\u03B9\u03CE\u03C3\u03B5\u03B9\u03C2
-GuiDemoTextMarkerController.menu.title.alt=\u0395\u03C0\u03B9\u03B4\u03B5\u03B9\u03BA\u03BD\u03CD\u03B5\u03B9 \u03C4\u03B9\u03C2 \u03C3\u03B7\u03BC\u03B5\u03B9\u03CE\u03C3\u03B5\u03B9\u03C2 \u03BA\u03B5\u03B9\u03BC\u03AD\u03BD\u03BF\u03C5 \u03BA\u03B1\u03B9 \u03C4\u03B1 \u03C7\u03B1\u03C1\u03B1\u03BA\u03C4\u03B7\u03C1\u03B9\u03C3\u03C4\u03B9\u03BA\u03AC \u03C4\u03BF\u03C5 \u03B3\u03BB\u03C9\u03C3\u03C3\u03B1\u03C1\u03AF\u03BF\u03C5
-GuiDemoTextMarkerController.notWorking=\u0397 \u03C5\u03C0\u03B5\u03C1\u03C4\u03CC\u03BD\u03B9\u03C3\u03B7 \u03B4\u03B5 \u03BB\u03B5\u03B9\u03C4\u03BF\u03C5\u03C1\u03B3\u03B5\u03AF \u03B1\u03C0\u03CC \u03BC\u03CC\u03BD\u03B7 \u03C4\u03B7\u03C2 \u03B1\u03C5\u03C4\u03AE \u03C4\u03B7 \u03C3\u03C4\u03B9\u03B3\u03BC\u03AE. \u03A7\u03C1\u03B7\u03C3\u03B9\u03BC\u03BF\u03C0\u03BF\u03B9\u03AE\u03C3\u03C4\u03B5 \u03C4\u03BF \u03B3\u03BB\u03C9\u03C3\u03C3\u03AC\u03C1\u03B9\u03BF \u03C3\u03B5 \u03AD\u03BD\u03B1 \u03BC\u03AC\u03B8\u03B7\u03BC\u03B1.
 GuiDemoTooltipsController.menu.title=\u03A3\u03C5\u03BC\u03B2\u03BF\u03C5\u03BB\u03AD\u03C2 \u03B3\u03B9\u03B1 \u03B5\u03C1\u03B3\u03B1\u03BB\u03B5\u03AF\u03B1 \u03B2\u03B1\u03C3\u03B9\u03C3\u03BC\u03AD\u03BD\u03B5\u03C2 \u03C3\u03C4\u03B7 \u03B2\u03B9\u03B2\u03BB\u03B9\u03BF\u03B8\u03AE\u03BA\u03B7 Extjs
 GuiDemoTooltipsController.menu.title.alt=\u0395\u03C0\u03B9\u03B4\u03B5\u03B9\u03BA\u03BD\u03CD\u03B5\u03B9 \u03C4\u03B9\u03C2 \u03C3\u03C5\u03BC\u03B2\u03BF\u03C5\u03BB\u03AD\u03C2 \u03B3\u03B9\u03B1 \u03B5\u03C1\u03B3\u03B1\u03BB\u03B5\u03AF\u03B1 \u03C3\u03B5 \u03B4\u03B9\u03AC\u03C6\u03BF\u03C1\u03B1 \u03B5\u03AF\u03B4\u03B7
 GuiDemoWindowControlController.menu.title=\u0388\u03BB\u03B5\u03B3\u03C7\u03BF\u03C2 \u03A0\u03B1\u03C1\u03B1\u03B8\u03CD\u03C1\u03BF\u03C5
diff --git a/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_en.properties
index 8b81009f764a60a2181676b5774bed7c3729f03f..eac4a6eb06a9c9d8fdb2ad3ecfaf8aea5c1bda93 100644
--- a/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_en.properties
@@ -33,9 +33,6 @@ GuiDemoTablesController.menu.title=Tables
 GuiDemoTablesController.menu.title.alt=Demonstrates tables
 GuiDemoTextBoxListController.menu.title=TextBoxList Autocompleter
 GuiDemoTextBoxListController.menu.title.alt=Demonstrates the TextBoxList Autocompleter used for tagging, search, etc.
-GuiDemoTextMarkerController.menu.title=Glossary and marker
-GuiDemoTextMarkerController.menu.title.alt=Demonstrates the text marker and glossary feature
-GuiDemoTextMarkerController.notWorking=Highlighting is not working stand-alone at the moment. Use glossary in a course. 
 GuiDemoTooltipsController.menu.title=Tooltips based on Extjs library
 GuiDemoTooltipsController.menu.title.alt=Demonstrates the tooltips in various flavours
 GuiDemoWindowControlController.menu.title=WindowControl
diff --git a/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_es.properties b/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_es.properties
index 250f6a07f2440fe172125364397d54cb804a21f1..346dd23e71132d787eccb3de27042aef2c627251 100644
--- a/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_es.properties
+++ b/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_es.properties
@@ -27,8 +27,6 @@ GuiDemoStepsRunner.menu.title=Pasos
 GuiDemoStepsRunner.menu.title.alt=Nuevo asistente
 GuiDemoTablesController.menu.title=Tablas
 GuiDemoTablesController.menu.title.alt=Demostraci\u00F3n de tablas
-GuiDemoTextMarkerController.menu.title=Glosario y marcador
-GuiDemoTextMarkerController.menu.title.alt=Demostraci\u00F3n de marcador de texto y funciones de glosario
 GuiDemoTooltipsController.menu.title=Tooltips basados en la librer\u00EDa Extjs
 GuiDemoTooltipsController.menu.title.alt=Demostraci\u00F3n de tooltips en distintas formas
 GuiDemoWindowControlController.menu.title=Control de ventana
diff --git a/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_fr.properties
index a02269ac33d6602b778001aa1179f4d3381d7f57..627284e28eb8f2c0af316cccd819068fb8b6247b 100644
--- a/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_fr.properties
@@ -33,9 +33,6 @@ GuiDemoTablesController.menu.title=Tables
 GuiDemoTablesController.menu.title.alt=Demonstrates Tables
 GuiDemoTextBoxListController.menu.title=TextBoxList Autocompleter
 GuiDemoTextBoxListController.menu.title.alt=Demonstrates the TextBoxList Autocompleter used for tagging, search, etc.
-GuiDemoTextMarkerController.menu.title=Glossar and marker
-GuiDemoTextMarkerController.menu.title.alt=Demonstrates the text marker and glossar feature
-GuiDemoTextMarkerController.notWorking=La s\u00E9lection ne fonctionne en ce moment uniquement dans le cadre d'une ressource (cours).
 GuiDemoTooltipsController.menu.title=Tooltips based on Extjs library
 GuiDemoTooltipsController.menu.title.alt=Demonstrates the tooltips in various flavours
 GuiDemoWindowControlController.menu.title=Window Control
diff --git a/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_it.properties
index 9c63798c80065e83e73e17f7185bfea446da47b0..2a48fa185960cd381bb4e1fefdd2a67d067b6ad7 100644
--- a/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_it.properties
+++ b/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_it.properties
@@ -31,9 +31,6 @@ GuiDemoTablesController.menu.title=Tables
 GuiDemoTablesController.menu.title.alt=Demonstrates Tables
 GuiDemoTextBoxListController.menu.title=TextBoxList Autocompleter
 GuiDemoTextBoxListController.menu.title.alt=Demonstrates the TextBoxList Autocompleter used for tagging, search, etc.
-GuiDemoTextMarkerController.menu.title=Glossar and marker
-GuiDemoTextMarkerController.menu.title.alt=Demonstrates the text marker and glossar feature
-GuiDemoTextMarkerController.notWorking=Highlighting is not working stand-alone at the moment. Use glossary in a course.
 GuiDemoTooltipsController.menu.title=Tooltips based on Extjs library
 GuiDemoTooltipsController.menu.title.alt=Demonstrates the tooltips in various flavours
 GuiDemoWindowControlController.menu.title=Window Control
diff --git a/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_jp.properties b/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_jp.properties
index b5102ce70c9abf6cf1365cd64176527c69418859..ac314d3ea8bb06baa7c149d8661aaa19e3af15e7 100644
--- a/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_jp.properties
+++ b/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_jp.properties
@@ -27,8 +27,6 @@ GuiDemoStepsRunner.menu.title=\u30B9\u30C6\u30C3\u30D7
 GuiDemoStepsRunner.menu.title.alt=\u65B0\u3057\u3044\u30A6\u30A3\u30B6\u30FC\u30C9
 GuiDemoTablesController.menu.title=\u30C6\u30FC\u30D6\u30EB
 GuiDemoTablesController.menu.title.alt=\u30C6\u30FC\u30D6\u30EB\u3092\u30C7\u30E2\u30F3\u30B9\u30C8\u30EC\u30FC\u30C8\u3059\u308B
-GuiDemoTextMarkerController.menu.title=\u7528\u8A9E\u304A\u3088\u3073\u30DE\u30FC\u30AB\u30FC
-GuiDemoTextMarkerController.menu.title.alt=\u30C6\u30AD\u30B9\u30C8\u30E1\u30FC\u30AB\u30FC\u304A\u3088\u3073\u7528\u8A9E\u96C6\u6A5F\u80FD\u3092\u30C7\u30E2\u30F3\u30B9\u30C8\u30EC\u30FC\u30C8\u3059\u308B
 GuiDemoTooltipsController.menu.title=Extjs\u30E9\u30A4\u30D6\u30E9\u30EA\u3092\u30D9\u30FC\u30B9\u3068\u3059\u308B\u30C4\u30FC\u30EB\u30C1\u30C3\u30D7
 GuiDemoWindowControlController.menu.title=\u30A6\u30A3\u30F3\u30C9\u30A6\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB
 GuiDemoWindowControlController.menu.title.alt=\u30A6\u30A3\u30F3\u30C9\u30A6\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u3092\u30C7\u30E2\u30F3\u30B9\u30C8\u30EC\u30FC\u30C8\u3059\u308B
diff --git a/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_nl_NL.properties b/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_nl_NL.properties
index bfed93be3cedabd8068bbe4332c80f13dab58151..c2617bea5d9f2ab0bc79eb0913dc89e0757fdd0c 100644
--- a/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_nl_NL.properties
+++ b/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_nl_NL.properties
@@ -31,9 +31,6 @@ GuiDemoTablesController.menu.title=Tabellen
 GuiDemoTablesController.menu.title.alt=Demonstreert tabellen
 GuiDemoTextBoxListController.menu.title=TextBoxList Autocompleter
 GuiDemoTextBoxListController.menu.title.alt=Demonstreert de TextBoxList Autocompleter gebruikt voor tagging, zoeken, etc.
-GuiDemoTextMarkerController.menu.title=Glossarium en markeerder
-GuiDemoTextMarkerController.menu.title.alt=Demonstreert de functies van het glossarium en de markeerder
-GuiDemoTextMarkerController.notWorking=Markeren werkt op dit moment niet. Gebruik glossarium in een cursus.
 GuiDemoTooltipsController.menu.title=Werktuigtips gebaseerd op Extjs bibliotheek
 GuiDemoTooltipsController.menu.title.alt=Demonstreert de werktuigtips in verschillende smaken
 GuiDemoWindowControlController.menu.title=VensterControle
diff --git a/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_pl.properties b/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_pl.properties
index 58b66832459a2a6b738bdb204a6226cfef1deda4..2781429e93412d0e7dadbe38c0dc7c139266ecb1 100644
--- a/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_pl.properties
+++ b/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_pl.properties
@@ -27,9 +27,6 @@ GuiDemoStepsRunner.menu.title=Steps
 GuiDemoStepsRunner.menu.title.alt=New Wizard
 GuiDemoTablesController.menu.title=Tables
 GuiDemoTablesController.menu.title.alt=Demonstrates Tables
-GuiDemoTextMarkerController.menu.title=Glossar and marker
-GuiDemoTextMarkerController.menu.title.alt=Demonstrates the text marker and glossar feature
-GuiDemoTextMarkerController.notWorking=Pod\u015Bwietlanie nie dzia\u0142a samodzielnie w tej chwili. U\u017Cyj s\u0142ownika w kursie.
 GuiDemoTooltipsController.menu.title=Tooltips based on Extjs library
 GuiDemoTooltipsController.menu.title.alt=Demonstrates the tooltips in various flavours
 GuiDemoWindowControlController.menu.title=Window Control
diff --git a/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_pt_BR.properties
index ed6ee18d1989eb62453fd67aa0fa1faa7999194e..acbee8ba5f7dcd9ef9650ae96ac546329cd6846f 100644
--- a/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_pt_BR.properties
@@ -33,9 +33,6 @@ GuiDemoTablesController.menu.title=Tables
 GuiDemoTablesController.menu.title.alt=Demonstrates Tables
 GuiDemoTextBoxListController.menu.title=TextBoxList Autopreenchimento
 GuiDemoTextBoxListController.menu.title.alt=Demonstra o Autopreenchimento TextBoxList usado para pesquisa, marca\u00E7\u00E3o, etc
-GuiDemoTextMarkerController.menu.title=Glossar and marker
-GuiDemoTextMarkerController.menu.title.alt=Demonstrates the text marker and glossar feature
-GuiDemoTextMarkerController.notWorking=Highlighting n\u00E3o est\u00E1 funcionando no momento. Use gloss\u00E1rio no curso.
 GuiDemoTooltipsController.menu.title=Tooltips based on Extjs library
 GuiDemoTooltipsController.menu.title.alt=Demonstrates the tooltips in various flavours
 GuiDemoWindowControlController.menu.title=Window Control
diff --git a/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_zh_CN.properties
index 31fbf99a24e1fd3352c1863dfe15fc6d187375bf..a2b89cda6d2f333db17030f958f9ce4debf47ec2 100644
--- a/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/gui/demo/guidemo/_i18n/LocalStrings_zh_CN.properties
@@ -27,9 +27,6 @@ GuiDemoStepsRunner.menu.title=\u6B65\u9AA4
 GuiDemoStepsRunner.menu.title.alt=\u65B0Wizard
 GuiDemoTablesController.menu.title=\u8868\u683C
 GuiDemoTablesController.menu.title.alt=\u6F14\u793A\u8868\u683C
-GuiDemoTextMarkerController.menu.title=\u672F\u8BED\u8BCD\u6C47\u8868\u548C\u4E66\u7B7E
-GuiDemoTextMarkerController.menu.title.alt=\u6F14\u793A\u6587\u672C\u4E66\u7B7E\u548C\u672F\u8BED\u8BCD\u6C47\u8868\u7684\u7279\u6027
-GuiDemoTextMarkerController.notWorking=\u5728\u5B66\u7A0B\u4E2D\u4F7F\u7528\u672F\u8BED\u8BCD\u6C47\u8868
 GuiDemoTooltipsController.menu.title=\u57FA\u4E8EExtjs\u5E93\u7684\u63D0\u793A\u6587\u672C
 GuiDemoTooltipsController.menu.title.alt=\u4EE5\u60A8\u559C\u6B22\u7684\u65B9\u5F0F\u6765\u6F14\u793A\u63D0\u793A\u6587\u672C
 GuiDemoWindowControlController.menu.title=\u7A97\u53E3\u63A7\u5236