From 3ade9d5f323c11610913c42820bc3453d3c650e7 Mon Sep 17 00:00:00 2001
From: gnaegi <none@none>
Date: Wed, 4 Nov 2015 23:27:26 +0100
Subject: [PATCH] OO-1658 deleting chelp package, cleanup of context help
legacy code
---
.../org/olat/core/_spring/mainCorecontext.xml | 1 -
.../contextHelp/ContextHelpComponent.java | 99 -------
.../ContextHelpComponentRenderer.java | 62 -----
.../contextHelp/ContextHelpDispatcher.java | 147 ----------
.../ContextHelpLayoutControllerCreator.java | 120 --------
.../ContextHelpMainController.java | 211 --------------
.../contextHelp/ContextHelpModule.java | 171 ------------
.../ContextHelpPageCrumbController.java | 257 ------------------
.../ContextHelpTOCCrumbController.java | 196 -------------
.../ContextHelpTopNavController.java | 185 -------------
.../contextHelp/ContextHelpVisitor.java | 150 ----------
.../_i18n/LocalStrings_ar.properties | 8 -
.../_i18n/LocalStrings_bg.properties | 8 -
.../_i18n/LocalStrings_cs.properties | 8 -
.../_i18n/LocalStrings_de.properties | 8 -
.../_i18n/LocalStrings_el.properties | 8 -
.../_i18n/LocalStrings_en.properties | 8 -
.../_i18n/LocalStrings_es.properties | 8 -
.../_i18n/LocalStrings_fr.properties | 8 -
.../_i18n/LocalStrings_it.properties | 8 -
.../_i18n/LocalStrings_jp.properties | 8 -
.../_i18n/LocalStrings_lt.properties | 8 -
.../_i18n/LocalStrings_nl_NL.properties | 8 -
.../_i18n/LocalStrings_pl.properties | 8 -
.../_i18n/LocalStrings_pt_BR.properties | 8 -
.../_i18n/LocalStrings_ru.properties | 8 -
.../_i18n/LocalStrings_sq.properties | 8 -
.../_i18n/LocalStrings_zh_CN.properties | 8 -
.../_i18n/LocalStrings_zh_TW.properties | 8 -
.../_i18n/i18nBundleMetadata.properties | 2 -
.../_spring/contextHelpCorecontext.xml | 48 ----
.../dispatcher/_spring/dispatcherContext.xml | 10 -
.../velocity/VelocityRenderDecorator.java | 138 ++--------
.../ui/TranslationToolLauncherController.java | 4 +-
.../gui/control/OlatDmzTopNavController.java | 8 +-
.../olat/gui/control/_content/dmztopnav.html | 17 +-
.../control/_i18n/LocalStrings_ar.properties | 4 +-
.../control/_i18n/LocalStrings_bg.properties | 4 +-
.../control/_i18n/LocalStrings_cs.properties | 4 +-
.../control/_i18n/LocalStrings_da.properties | 4 +-
.../control/_i18n/LocalStrings_de.properties | 21 +-
.../control/_i18n/LocalStrings_el.properties | 4 +-
.../control/_i18n/LocalStrings_en.properties | 4 +-
.../control/_i18n/LocalStrings_es.properties | 4 +-
.../control/_i18n/LocalStrings_fa.properties | 4 +-
.../control/_i18n/LocalStrings_fr.properties | 4 +-
.../control/_i18n/LocalStrings_it.properties | 4 +-
.../control/_i18n/LocalStrings_jp.properties | 3 +-
.../control/_i18n/LocalStrings_lt.properties | 4 +-
.../_i18n/LocalStrings_nl_NL.properties | 4 +-
.../control/_i18n/LocalStrings_pl.properties | 4 +-
.../_i18n/LocalStrings_pt_BR.properties | 4 +-
.../_i18n/LocalStrings_pt_PT.properties | 4 +-
.../control/_i18n/LocalStrings_ru.properties | 4 +-
.../control/_i18n/LocalStrings_sq.properties | 4 +-
.../_i18n/LocalStrings_zh_CN.properties | 4 +-
.../_i18n/LocalStrings_zh_TW.properties | 4 +-
.../olat/ims/cp/ui/CPContentController.java | 19 +-
.../cp/ui/_i18n/LocalStrings_ar.properties | 4 +-
.../cp/ui/_i18n/LocalStrings_bg.properties | 4 +-
.../cp/ui/_i18n/LocalStrings_de.properties | 122 ++++-----
.../cp/ui/_i18n/LocalStrings_el.properties | 4 +-
.../cp/ui/_i18n/LocalStrings_en.properties | 4 +-
.../cp/ui/_i18n/LocalStrings_es.properties | 4 +-
.../cp/ui/_i18n/LocalStrings_fr.properties | 4 +-
.../cp/ui/_i18n/LocalStrings_it.properties | 4 +-
.../cp/ui/_i18n/LocalStrings_jp.properties | 4 +-
.../cp/ui/_i18n/LocalStrings_nl_NL.properties | 4 +-
.../cp/ui/_i18n/LocalStrings_pl.properties | 4 +-
.../cp/ui/_i18n/LocalStrings_pt_BR.properties | 4 +-
.../cp/ui/_i18n/LocalStrings_ru.properties | 4 +-
.../cp/ui/_i18n/LocalStrings_zh_CN.properties | 4 +-
.../cp/ui/_i18n/LocalStrings_zh_TW.properties | 4 +-
.../cp/ui/_i18n/i18nBundleMetadata.properties | 4 +-
.../login/_i18n/LocalStrings_ar.properties | 4 +-
.../login/_i18n/LocalStrings_bg.properties | 4 +-
.../login/_i18n/LocalStrings_cs.properties | 4 +-
.../login/_i18n/LocalStrings_da.properties | 16 +-
.../login/_i18n/LocalStrings_de.properties | 93 +++----
.../login/_i18n/LocalStrings_el.properties | 4 +-
.../login/_i18n/LocalStrings_en.properties | 67 ++---
.../login/_i18n/LocalStrings_es.properties | 4 +-
.../login/_i18n/LocalStrings_fa.properties | 4 +-
.../login/_i18n/LocalStrings_fr.properties | 4 +-
.../login/_i18n/LocalStrings_it.properties | 4 +-
.../login/_i18n/LocalStrings_jp.properties | 3 +-
.../login/_i18n/LocalStrings_lt.properties | 4 +-
.../login/_i18n/LocalStrings_nl_NL.properties | 4 +-
.../login/_i18n/LocalStrings_pl.properties | 4 +-
.../login/_i18n/LocalStrings_pt_BR.properties | 4 +-
.../login/_i18n/LocalStrings_pt_PT.properties | 4 +-
.../login/_i18n/LocalStrings_ru.properties | 4 +-
.../login/_i18n/LocalStrings_sq.properties | 17 +-
.../login/_i18n/LocalStrings_zh_CN.properties | 4 +-
.../login/_i18n/LocalStrings_zh_TW.properties | 4 +-
.../login/_i18n/i18nBundleMetadata.properties | 14 +-
.../org/olat/search/_spring/searchContext.xml | 3 -
.../service/document/ContextHelpDocument.java | 115 --------
.../service/indexer/ContextHelpIndexer.java | 170 ------------
.../ui/AdvancedSearchInputController.java | 3 +-
.../search/ui/SearchControllerFactory.java | 8 +-
.../resources/serviceconfig/olat.properties | 14 +-
102 files changed, 299 insertions(+), 2559 deletions(-)
delete mode 100644 src/main/java/org/olat/core/commons/contextHelp/ContextHelpComponent.java
delete mode 100644 src/main/java/org/olat/core/commons/contextHelp/ContextHelpComponentRenderer.java
delete mode 100644 src/main/java/org/olat/core/commons/contextHelp/ContextHelpDispatcher.java
delete mode 100644 src/main/java/org/olat/core/commons/contextHelp/ContextHelpLayoutControllerCreator.java
delete mode 100644 src/main/java/org/olat/core/commons/contextHelp/ContextHelpMainController.java
delete mode 100644 src/main/java/org/olat/core/commons/contextHelp/ContextHelpModule.java
delete mode 100644 src/main/java/org/olat/core/commons/contextHelp/ContextHelpPageCrumbController.java
delete mode 100644 src/main/java/org/olat/core/commons/contextHelp/ContextHelpTOCCrumbController.java
delete mode 100644 src/main/java/org/olat/core/commons/contextHelp/ContextHelpTopNavController.java
delete mode 100644 src/main/java/org/olat/core/commons/contextHelp/ContextHelpVisitor.java
delete mode 100644 src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_ar.properties
delete mode 100644 src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_bg.properties
delete mode 100644 src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_cs.properties
delete mode 100644 src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_de.properties
delete mode 100644 src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_el.properties
delete mode 100644 src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_en.properties
delete mode 100644 src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_es.properties
delete mode 100644 src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_fr.properties
delete mode 100644 src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_it.properties
delete mode 100644 src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_jp.properties
delete mode 100644 src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_lt.properties
delete mode 100644 src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_nl_NL.properties
delete mode 100644 src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_pl.properties
delete mode 100644 src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_pt_BR.properties
delete mode 100644 src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_ru.properties
delete mode 100644 src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_sq.properties
delete mode 100644 src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_zh_CN.properties
delete mode 100644 src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_zh_TW.properties
delete mode 100644 src/main/java/org/olat/core/commons/contextHelp/_i18n/i18nBundleMetadata.properties
delete mode 100644 src/main/java/org/olat/core/commons/contextHelp/_spring/contextHelpCorecontext.xml
delete mode 100644 src/main/java/org/olat/search/service/document/ContextHelpDocument.java
delete mode 100644 src/main/java/org/olat/search/service/indexer/ContextHelpIndexer.java
diff --git a/src/main/java/org/olat/core/_spring/mainCorecontext.xml b/src/main/java/org/olat/core/_spring/mainCorecontext.xml
index b5275e2e689..e1803faf008 100644
--- a/src/main/java/org/olat/core/_spring/mainCorecontext.xml
+++ b/src/main/java/org/olat/core/_spring/mainCorecontext.xml
@@ -24,7 +24,6 @@
<import resource="classpath:/org/olat/core/commons/fullWebApp/util/_spring/StickyMessageCorecontext.xml"/>
<import resource="classpath:/org/olat/core/commons/modules/bc/_spring/folderModuleCorecontext.xml"/>
<import resource="classpath:/org/olat/core/commons/modules/glossary/_spring/glossaryCorecontext.xml"/>
- <import resource="classpath:/org/olat/core/commons/contextHelp/_spring/contextHelpCorecontext.xml"/>
<import resource="classpath:/org/olat/core/logging/_spring/loggingCorecontext.xml"/>
<import resource="classpath:/org/olat/core/logging/activity/_spring/activityCorecontext.xml"/>
diff --git a/src/main/java/org/olat/core/commons/contextHelp/ContextHelpComponent.java b/src/main/java/org/olat/core/commons/contextHelp/ContextHelpComponent.java
deleted file mode 100644
index c2605556c41..00000000000
--- a/src/main/java/org/olat/core/commons/contextHelp/ContextHelpComponent.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * <a href="http://www.openolat.org">
- * OpenOLAT - Online Learning and Training</a><br>
- * <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 the
- * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
- * <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>
- * Initial code contributed and copyrighted by<br>
- * frentix GmbH, http://www.frentix.com
- * <p>
- */
-package org.olat.core.commons.contextHelp;
-import java.util.Locale;
-
-/**
-
- * OpenOLAT - Online Learning and Training</a><br>
- * <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 the
- * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
- * <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>
- * Initial code contributed and copyrighted by<br>
- * frentix GmbH, http://www.frentix.com
- * <p>
- */
-import org.olat.core.gui.UserRequest;
-import org.olat.core.gui.components.AbstractComponent;
-import org.olat.core.gui.components.ComponentRenderer;
-import org.olat.core.gui.translator.Translator;
-import org.olat.core.util.Util;
-
-/**
- *
- * A link to the context help
- *
- * Initial date: 17.06.2014<br>
- * @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
- *
- */
-public class ContextHelpComponent extends AbstractComponent {
-
- private static ComponentRenderer RENDERER ;
-
- private final Locale locale;
-
- public ContextHelpComponent(String name, Locale locale) {
- super(name);
- this.locale = locale;
- setTranslator(Util.createPackageTranslator(ContextHelpComponent.class, locale));
- RENDERER = new ContextHelpComponentRenderer(name);
- }
-
- public Locale getLocale() {
- return locale;
- }
-
- public void setTranslator(Translator translator) {
- if(translator == null) {
- System.out.println();
- }
- super.setTranslator(translator);
- }
-
- /**
- *
- * @param name Name of the component
- * @param packageName Package name where the help is
- * @param pageName The name of the page of this specific context help
- * @param hoverTextKey i18n key of the tooltip
- * @param locale Locale of the user
- */
-
-
- @Override
- protected void doDispatchRequest(UserRequest ureq) {
- //
- }
-
- @Override
- public ComponentRenderer getHTMLRendererSingleton() {
- return RENDERER;
- }
-}
diff --git a/src/main/java/org/olat/core/commons/contextHelp/ContextHelpComponentRenderer.java b/src/main/java/org/olat/core/commons/contextHelp/ContextHelpComponentRenderer.java
deleted file mode 100644
index 53be0716e1a..00000000000
--- a/src/main/java/org/olat/core/commons/contextHelp/ContextHelpComponentRenderer.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * <a href="http://www.openolat.org">
- * OpenOLAT - Online Learning and Training</a><br>
- * <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 the
- * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
- * <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>
- * Initial code contributed and copyrighted by<br>
- * frentix GmbH, http://www.frentix.com
- * <p>
- */
-package org.olat.core.commons.contextHelp;
-
-import org.olat.core.CoreSpringFactory;
-import org.olat.core.commons.services.help.HelpModule;
-import org.olat.core.gui.components.Component;
-import org.olat.core.gui.components.DefaultComponentRenderer;
-import org.olat.core.gui.render.RenderResult;
-import org.olat.core.gui.render.Renderer;
-import org.olat.core.gui.render.StringOutput;
-import org.olat.core.gui.render.URLBuilder;
-import org.olat.core.gui.translator.Translator;
-import org.olat.core.util.StringHelper;
-
-/**
- * Draw the link to the context help.
- *
- *
- * Initial date: 17.06.2014<br>
- * @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
- *
- */
-public class ContextHelpComponentRenderer extends DefaultComponentRenderer {
-
- private final String page;
-
- public ContextHelpComponentRenderer(String page) {
- this.page = page;
- }
-
- @Override
- public void render(Renderer renderer, StringOutput sb, Component source, URLBuilder ubu,
- Translator translator, RenderResult renderResult, String[] args) {
-
- HelpModule helpModule = CoreSpringFactory.getImpl(HelpModule.class);
- String title = StringHelper.escapeHtml(source.getTranslator().translate("help.button"));
- String url = helpModule.getHelpProvider().getURL(source.getTranslator().getLocale(), page);
- sb.append("<a href=\"").append(url)
- .append("\" class=\"o_chelp\" target=\"_blank\" title=\"").append(title).append("\"><i class='o_icon o_icon_help'></i> ")
- .append(source.getTranslator().translate("help"))
- .append("</a>");
-
- }
-}
diff --git a/src/main/java/org/olat/core/commons/contextHelp/ContextHelpDispatcher.java b/src/main/java/org/olat/core/commons/contextHelp/ContextHelpDispatcher.java
deleted file mode 100644
index 88741bd812a..00000000000
--- a/src/main/java/org/olat/core/commons/contextHelp/ContextHelpDispatcher.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/**
- * <a href="http://www.openolat.org">
- * OpenOLAT - Online Learning and Training</a><br>
- * <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 the
- * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
- * <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>
- * Initial code contributed and copyrighted by<br>
- * frentix GmbH, http://www.frentix.com
- * <p>
- */
-
-package org.olat.core.commons.contextHelp;
-
-import java.util.Locale;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.olat.core.commons.fullWebApp.BaseFullWebappPopupBrowserWindow;
-import org.olat.core.commons.fullWebApp.LayoutMain3ColsController;
-import org.olat.core.dispatcher.Dispatcher;
-import org.olat.core.dispatcher.DispatcherModule;
-import org.olat.core.gui.UserRequest;
-import org.olat.core.gui.UserRequestImpl;
-import org.olat.core.gui.Windows;
-import org.olat.core.gui.components.Window;
-import org.olat.core.gui.control.ChiefController;
-import org.olat.core.gui.control.Controller;
-import org.olat.core.gui.control.WindowControl;
-import org.olat.core.gui.control.creator.ControllerCreator;
-import org.olat.core.gui.exception.MsgFactory;
-import org.olat.core.logging.LogDelegator;
-import org.olat.core.util.WebappHelper;
-
-/**
- * <h3>Description:</h3> The context help dispatcher displays context help files
- * to a separate popup window.
- * <p>
- * The dispatcher can be used with an authenticated session or with a
- * non-authenticated session.
- *
- * <p>
- * Initial Date: 30.10.2008 <br>
- *
- * @author Florian Gnaegi, frentix GmbH, http://www.frentix.com
- */
-
-public class ContextHelpDispatcher extends LogDelegator implements Dispatcher {
- private static String PATH_CHELP;
-
- public ContextHelpDispatcher(String contextHelpMapperPath) {
- PATH_CHELP = contextHelpMapperPath;
- }
-
- /**
- * @see org.olat.core.dispatcher.Dispatcher#execute(javax.servlet.http.HttpServletRequest,
- * javax.servlet.http.HttpServletResponse, java.lang.String)
- */
- @Override
- public void execute(HttpServletRequest request, HttpServletResponse response) {
- UserRequest ureq = null;
-
- try {
- String uriPrefix = DispatcherModule.getLegacyUriPrefix(request);
- ureq = new UserRequestImpl(uriPrefix, request, response);
- if (!ContextHelpModule.isContextHelpEnabled()) {
- // disabled context help - redirect immediately
- DispatcherModule.sendNotFound(ureq.getNonParsedUri(), response);
- return;
- }
-
- ChiefController cc = Windows.getWindows(ureq.getUserSession()).getContextHelpChiefController();
- // reuse existing chief controller for this user
- if (cc != null) {
- Window currentWindow = cc.getWindow();
- // Check if this is a start URL or a framework URL
- if (ureq.isValidDispatchURI()) {
- // A standard framework request, dispatch by component
- currentWindow.dispatchRequest(ureq, false);
- return;
- } else {
- // If path contains complete URL, dispose and start from scratch
- Windows.getWindows(ureq).deregisterWindow(currentWindow);
- cc.dispose();
- }
- }
-
- // Creator code to create
- // 1) the chief controller
- // 2) the layout controller
- // 3) the context help main controller
-
- ControllerCreator cHelpMainControllerCreator = new ControllerCreator() {
- public Controller createController(UserRequest lureq, WindowControl lwControl) {
- // create the context help controller and wrapp it using the layout controller
- ContextHelpMainController helpCtr = new ContextHelpMainController(lureq, lwControl);
- LayoutMain3ColsController layoutCtr = new LayoutMain3ColsController(lureq, lwControl, helpCtr);
- return layoutCtr;
- }
- };
- ContextHelpLayoutControllerCreator cHelpPopupLayoutCreator = new ContextHelpLayoutControllerCreator(cHelpMainControllerCreator);
- cc = new BaseFullWebappPopupBrowserWindow(ureq, cHelpPopupLayoutCreator.getFullWebappParts());
- // add to user session for cleanup on user logout
- Windows.getWindows(ureq.getUserSession()).setContextHelpChiefController(cc);
- Window currentWindow = cc.getWindow();
- currentWindow.setUriPrefix(WebappHelper.getServletContextPath() + PATH_CHELP);
- Windows.getWindows(ureq).registerWindow(currentWindow);
- // finally dispatch the initial request
- currentWindow.dispatchRequest(ureq, true);
-
- } catch (Throwable th) {
- try {
- ChiefController msgcc = MsgFactory.createMessageChiefController(ureq, th);
- // the controller's window must be failsafe also
- msgcc.getWindow().dispatchRequest(ureq, true);
- // do not dispatch (render only), since this is a new Window created as
- // a result of another window's click.
- } catch (Throwable t) {
- logError("Sorry, can't handle this context help request....", t);
- }
- }
-
- }
-
- /**
- * Create an URL for the given locale, bundle and page that can be dispatched
- * by this dispatcher
- *
- * @param locale The desired locale
- * @param bundleName The bundle name, e.g. "org.olat.core"
- * @param page The page, e.g. "my-file.html"
- * @return
- */
- public static String createContextHelpURI(Locale locale, String bundleName, String page) {
- return WebappHelper.getServletContextPath() + PATH_CHELP + locale.toString() + "/" + bundleName + "/" + page;
- }
-
-}
diff --git a/src/main/java/org/olat/core/commons/contextHelp/ContextHelpLayoutControllerCreator.java b/src/main/java/org/olat/core/commons/contextHelp/ContextHelpLayoutControllerCreator.java
deleted file mode 100644
index 4fefb88dab9..00000000000
--- a/src/main/java/org/olat/core/commons/contextHelp/ContextHelpLayoutControllerCreator.java
+++ /dev/null
@@ -1,120 +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.core.commons.contextHelp;
-
-import java.util.List;
-
-import org.olat.core.CoreSpringFactory;
-import org.olat.core.commons.fullWebApp.BaseFullWebappControllerParts;
-import org.olat.core.commons.fullWebApp.LockableController;
-import org.olat.core.commons.fullWebApp.popup.BaseFullWebappPopupLayout;
-import org.olat.core.gui.UserRequest;
-import org.olat.core.gui.control.Controller;
-import org.olat.core.gui.control.WindowControl;
-import org.olat.core.gui.control.creator.ControllerCreator;
-import org.olat.core.gui.control.navigation.SiteInstance;
-
-/**
- * Description:<br>
- * The context help layout controller creator creates a standard minimal layout
- *
- * <p>
- * Initial Date: 30.10.2008 <br>
- *
- * @author Florian Gnaegi, frentix GmbH, http://www.frentix.com
- */
-class ContextHelpLayoutControllerCreator implements BaseFullWebappPopupLayout {
- private ControllerCreator contentControllerCreator;
-
-
- ContextHelpLayoutControllerCreator(ControllerCreator contentControllerCreator){
- this.contentControllerCreator = contentControllerCreator;
- }
-
- /**
- * @see org.olat.core.commons.fullWebApp.popup.BaseFullWebappPopupLayout#getFullWebappParts()
- */
- @Override
- public BaseFullWebappControllerParts getFullWebappParts() {
-
- return new BaseFullWebappControllerParts() {
-
- @Override
- public List<SiteInstance> getSiteInstances(UserRequest ureq, WindowControl control) {
- // no static sites
- return null;
- }
-
- @Override
- public Controller getContentController(UserRequest ureq, WindowControl wControl) {
- // the content for the Pop-up Window
- return contentControllerCreator.createController(ureq, wControl);
- }
-
- @Override
- public LockableController createTopNavController(UserRequest ureq, WindowControl wControl) {
- LockableController topnavCtr = null;
- // ----------- topnav, optional (e.g. for imprint, logout) ------------------
- if (CoreSpringFactory.containsBean("fullWebApp.ContextHelpTopNavControllerCreator")) {
- ControllerCreator topnavControllerCreator = (ControllerCreator) CoreSpringFactory.getBean("fullWebApp.ContextHelpTopNavControllerCreator");
- topnavCtr = (LockableController)topnavControllerCreator.createController(ureq, wControl);
- }
- return topnavCtr;
- }
-
- @Override
- public Controller createHeaderController(UserRequest ureq, WindowControl control) {
- Controller headerCtr = null;
- // ----------- header, optional (e.g. for logo, advertising ) ------------------
- if (CoreSpringFactory.containsBean("fullWebApp.ContextHelpHeaderControllerCreator")) {
- ControllerCreator headerControllerCreator = (ControllerCreator) CoreSpringFactory.getBean("fullWebApp.ContextHelpHeaderControllerCreator");
- headerCtr = headerControllerCreator.createController(ureq, control);
- }
- return headerCtr;
- }
-
- @Override
- public LockableController createFooterController(UserRequest ureq, WindowControl control) {
- Controller footerCtr = null;
- // ----------- footer, optional (e.g. for copyright, powerd by) ------------------
- if (CoreSpringFactory.containsBean("fullWebApp.ContextHelpFooterControllerCreator")) {
- ControllerCreator footerCreator = (ControllerCreator) CoreSpringFactory.getBean("fullWebApp.ContextHelpFooterControllerCreator");
- footerCtr = footerCreator.createController(ureq, control);
- }
- return (LockableController)footerCtr;
- }
- };
- }
-
- /**
- * @see org.olat.core.gui.control.creator.ControllerCreator#createController(org.olat.core.gui.UserRequest,
- * org.olat.core.gui.control.WindowControl)
- */
- public Controller createController(UserRequest lureq, WindowControl lwControl) {
- // content without topnav etc.
- return contentControllerCreator.createController(lureq, lwControl);
- }
-
-}
diff --git a/src/main/java/org/olat/core/commons/contextHelp/ContextHelpMainController.java b/src/main/java/org/olat/core/commons/contextHelp/ContextHelpMainController.java
deleted file mode 100644
index b87fba6ea88..00000000000
--- a/src/main/java/org/olat/core/commons/contextHelp/ContextHelpMainController.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/**
- * <a href="http://www.openolat.org">
- * OpenOLAT - Online Learning and Training</a><br>
- * <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 the
- * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
- * <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>
- * Initial code contributed and copyrighted by<br>
- * frentix GmbH, http://www.frentix.com
- * <p>
- */
-
-package org.olat.core.commons.contextHelp;
-
-import java.util.Locale;
-
-import org.apache.commons.lang.ArrayUtils;
-import org.olat.core.commons.chiefcontrollers.LanguageChangedEvent;
-import org.olat.core.dispatcher.DispatcherModule;
-import org.olat.core.dispatcher.impl.StaticMediaDispatcher;
-import org.olat.core.gui.UserRequest;
-import org.olat.core.gui.components.Component;
-import org.olat.core.gui.components.panel.MainPanel;
-import org.olat.core.gui.control.Event;
-import org.olat.core.gui.control.WindowControl;
-import org.olat.core.gui.control.controller.MainLayoutBasicController;
-import org.olat.core.gui.control.generic.breadcrumb.BreadCrumbController;
-import org.olat.core.logging.activity.CoreLoggingResourceable;
-import org.olat.core.logging.activity.OlatLoggingAction;
-import org.olat.core.logging.activity.StringResourceableType;
-import org.olat.core.logging.activity.ThreadLocalUserActivityLogger;
-import org.olat.core.util.event.EventBus;
-import org.olat.core.util.event.GenericEventListener;
-import org.olat.core.util.i18n.I18nManager;
-import org.olat.core.util.i18n.I18nModule;
-
-/**
- * <h3>Description:</h3> This controller serves as the main entry point of the
- * context help display controller. The workflow is intended to run in a
- * separate window.
- * <p>
- * The controller can be triggered in two modes:
- * <ul>
- * <li>/help/de/org.olat.core/mychelp_page.html : the new, preferred style</li>
- * <li>/help/de/mychelp_page.html : legacy mode to support old external links.
- * Don't use this when creating new pages!</li>
- * </li> Those are only the entry URL's. As soon as the window is build up,
- * everything works via the framework.
- * <p>
- * To be delievered context help files must be in a _chelp directory in the
- * classpath. Links to the page are made using the velocity helper method
- * $r.contextHelp("org.olat.core", "mychelp_page.html", "help to mypage")
- * <p>
- * Each context help page must provide a translated title in the same package as
- * the page is located using the syntax 'chelp.PAGENAME.title': Example: <br>
- * <code>page: my.package._chelp.my_help.html </code><br>
- * <code>chelp.my_help.title translated in my.package._i18n</code>
- * <p>
- * Context help files can reference static resources, e.g. images. Those images
- * must be in the _static directory within the _chelp directory:<br>
- * <code>resource: my.package._chelp._static.myimage_de.png</code> <br>
- * The resource must be in the static directory for each locale. A fallback
- * mechanism checks if the resource exists and uses the fallback image when no
- * image is found. <br>
- * In the html template the resource must be addressed without the locale, e.g:
- * <code><img src='chelpStaticDirUrl/myimage.png' ></code> <br>
- * This will load the resource from my.package._chelp._static.myimage_de.png
- * <p>
- * The controller listens to LanguageChangedEvent and changes the locale for is
- * children when such an event occures (fired by ContextHelpTopNavController)
- * <p>
- * The workflow features a table of contents and a page details view. The
- * navigation is implemented using a bread crumb controller. Sub-pages are also
- * supported. Links to those sub-pages must be made with<br>
- * <code>$r.contextHelpRelativeLink("my-pagename.html")</code>
- *
- * <h3>Events thrown by this controller:</h3>
- * <ul>
- * <li>none</li>
- * </ul>
- * <p>
- * Initial Date: 04.11.2008 <br>
- *
- * @author Florian Gnaegi, frentix GmbH, http://www.frentix.com
- */
-
-class ContextHelpMainController extends MainLayoutBasicController implements GenericEventListener {
- private BreadCrumbController breadCrumbLayoutCtr;
- private ContextHelpTOCCrumbController startCtr;
- private EventBus eventBus;
-
- /**
- * Constructor for the context help display.
- * @param ureq
- * @param control
- */
- public ContextHelpMainController(UserRequest ureq, WindowControl control) {
- super(ureq, control);
- String[] uriParts = ureq.getNonParsedUri().split("/");
- String lang = null;
- // get lang and set locale for help page accordingly
- lang = uriParts[0];
- Locale newLocale = I18nManager.getInstance().getLocaleOrNull(lang);
- if ( newLocale == null || !I18nModule.getEnabledLanguageKeys().contains(newLocale.toString())) {
- newLocale = I18nModule.getDefaultLocale();
- }
- if (! getLocale().toString().equals(newLocale.toString())) {
- setLocale(newLocale, true);
- }
- // Create bread crumb navigation
- breadCrumbLayoutCtr = new BreadCrumbController(ureq, control);
- listenTo(breadCrumbLayoutCtr);
- // Add translation tool start controller to bread crumb
- startCtr = new ContextHelpTOCCrumbController(ureq, control, newLocale);
- listenTo(startCtr);
- breadCrumbLayoutCtr.activateFirstCrumbController(startCtr);
-
- MainPanel mainPanel = new MainPanel("");
- mainPanel.pushContent(breadCrumbLayoutCtr.getInitialComponent());
- putInitialPanel(mainPanel);
-
- activatePageFromURL(uriParts, ureq, startCtr);
-
- // Register for events on this user session. Identity is set to null, but
- // event bus is still user-session only
- eventBus = ureq.getUserSession().getSingleUserEventCenter();
- eventBus.registerFor(this, ureq.getIdentity(), ContextHelpTopNavController.CHANGE_LANG_RESOURCE);
-
- // do logging
- if (ureq.getUserSession().getSessionInfo()!=null) {
- // context help can be called in dmz zone as well - in that case don't call log() - only call log() for logged-in users
- ThreadLocalUserActivityLogger.log(OlatLoggingAction.CS_HELP, getClass(), CoreLoggingResourceable.wrapNonOlatResource(StringResourceableType.csHelp, "-1", ArrayUtils.toString(uriParts)));
- }
- }
-
- /**
- * Internal helper to parse the URL for an entry point to a specific help page
- * @param uriParts
- * @param ureq
- * @param activateableController
- */
- private void activatePageFromURL(String[] uriParts, UserRequest ureq, ContextHelpTOCCrumbController activateableController) {
- // Initialize active page
- // add context help page
- // Try to extract requested help page from URI
- String page = null, bundleName = null;
- if (uriParts.length == 2) {
- // 1) Legacy context help URL : lookup from map and if not found
- // redirect to static dispatcher to load old static help file
- page = uriParts[1];
- bundleName = ContextHelpModule.getContextHelpPagesLegacyLookupIndex().get(page);
- if (bundleName == null) {
- // Help page not found, try it with static legacy help files
- String legacyHelpUrl = StaticMediaDispatcher.createStaticURIFor("help/" + ureq.getNonParsedUri());
- DispatcherModule.redirectTo(ureq.getHttpResp(), legacyHelpUrl);
- return;
- }
-
- } else if (uriParts.length == 3) {
- // 2) Normal case: get page bundle and name
- bundleName = uriParts[1];
- page = uriParts[2];
- }
-
- if (page != null || bundleName != null) {
- activateableController.activatePage(ureq, bundleName, page);
- }
-
- }
-
- /**
- * @see org.olat.core.util.event.GenericEventListener#event(org.olat.core.gui.control.Event)
- */
- public void event(Event event) {
- if (event instanceof LanguageChangedEvent) {
- LanguageChangedEvent langEvent = (LanguageChangedEvent) event;
- Locale newLocale = langEvent.getNewLocale();
- setLocale(newLocale, true);
- // Set new locale on bread crumb chain
- startCtr.setLocale(newLocale, langEvent.getCurrentUreq());
- // Reset all text lables on bread crumb
- breadCrumbLayoutCtr.resetCrumbTexts();
- }
- }
-
- /* (non-Javadoc)
- * @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)
- */
- @Override
- protected void event(UserRequest ureq, Component source, Event event) {
- // no events to catch
- }
-
- /* (non-Javadoc)
- * @see org.olat.core.gui.control.DefaultController#doDispose()
- */
- @Override
- protected void doDispose() {
- // Controllers autodisposed by BasicController
- eventBus.deregisterFor(this, ContextHelpTopNavController.CHANGE_LANG_RESOURCE);
- eventBus = null;
- }
-}
diff --git a/src/main/java/org/olat/core/commons/contextHelp/ContextHelpModule.java b/src/main/java/org/olat/core/commons/contextHelp/ContextHelpModule.java
deleted file mode 100644
index e1309e1dd58..00000000000
--- a/src/main/java/org/olat/core/commons/contextHelp/ContextHelpModule.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
- * <a href="http://www.openolat.org">
- * OpenOLAT - Online Learning and Training</a><br>
- * <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 the
- * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
- * <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>
- * Initial code contributed and copyrighted by<br>
- * frentix GmbH, http://www.frentix.com
- * <p>
- */
-
-package org.olat.core.commons.contextHelp;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.olat.core.configuration.AbstractOLATModule;
-import org.olat.core.configuration.Destroyable;
-import org.olat.core.configuration.PersistedProperties;
-import org.olat.core.util.FileUtils;
-import org.olat.core.util.WebappHelper;
-
-/**
- * <h3>Description:</h3>
- * The context help module offers configuration methods for the context help system
- * <p>
- * Initial Date: 31.10.2008 <br>
- *
- * @author Florian Gnaegi, frentix GmbH, http://www.frentix.com
- */
-
-public class ContextHelpModule extends AbstractOLATModule implements Destroyable {
- public static final String CHELP_DIR = "/_chelp/";
- //fxdiff FXOLAT-185:fix loading of files in jar
- public static final String CHELP_STATIC_DIR = CHELP_DIR + "_static/";
-
- private static final String CONFIG_CONTEXTHELP_ENABLED = "contextHelpEnabled";
- private static final String CONFIG_RATING_ENABLED = "ratingEnabled";
-
- private static boolean isContextHelpEnabled = true;
- private static boolean isContextRatingEnabled = true;
-
-
- // Initilize context help lookup cache - VM scope, clustersave
- private static final Map<String,String> contextHelpPagesLegacyLookupIndex = new HashMap<String,String>();
- private static final Set<String> allContextHelpPages = new HashSet<String>();
- private static Set<String> blacklist;
-
- /**
- * @see org.olat.core.configuration.AbstractOLATModule#init()
- */
- @Override
- public void init() {
- // load configuration
- isContextHelpEnabled = getBooleanConfigParameter(CONFIG_CONTEXTHELP_ENABLED, true);
- isContextRatingEnabled = getBooleanConfigParameter(CONFIG_RATING_ENABLED, true);
-
- // search for help pages
- if (isContextHelpEnabled) {
- refreshContextHelpIndex();
- }
- }
-
- @Override
- protected void initDefaultProperties() {
- // context help has no user configurable properties so far
- }
-
-
- @Override
- protected void initFromChangedProperties() {
- // context help has no user configurable properties so far
- }
-
- /**
- * [used by spring]
- * @param persistedProperties
- */
- public void setPersistedProperties(PersistedProperties persistedProperties) {
- this.moduleConfigProperties = persistedProperties;
- }
-
- /**
- * [used by spring]
- * @param blackist
- */
- public void setCHelpBlacklist(Set<String> blackist) {
- blacklist = blackist;
- }
-
- /**
- *
- * @see org.olat.core.configuration.Destroyable#destroy()
- */
- public void destroy() {
- contextHelpPagesLegacyLookupIndex.clear();
- allContextHelpPages.clear();
- }
-
-
- public static synchronized void refreshContextHelpIndex() {
- contextHelpPagesLegacyLookupIndex.clear();
- allContextHelpPages.clear();
-
- // 1) Search for context help files from compiled web app classpath
- String srcPath = WebappHelper.getContextRealPath("/WEB-INF/classes");
- if(srcPath != null) {
- ContextHelpVisitor srcVisitor = new ContextHelpVisitor(srcPath, contextHelpPagesLegacyLookupIndex, allContextHelpPages, blacklist);
- FileUtils.visitRecursively(new File(srcPath), srcVisitor);
- }
- // 2) Search in libs directory
- /*
- String libDirPath = WebappHelper.getContextRoot() + "/WEB-INF/lib";
- ContextHelpVisitor libVisitor = new ContextHelpVisitor(libDirPath, contextHelpPagesLegacyLookupIndex, allContextHelpPages, blacklist);
- FileUtils.visitRecursively(new File(libDirPath), libVisitor);
- */
- }
-
-
- /**
- * @return true: use context help; false: don't show context help
- */
- public static boolean isContextHelpEnabled() {
- return isContextHelpEnabled;
- }
-
- /**
- * @return true: allow users to rate help pages; false: don't allow users to rate help pages
- */
- public static boolean isContextRatingEnabled() {
- return isContextRatingEnabled;
- }
-
- /**
- * @return lookup map that can be used to find the package of a page when
- * only the page name is known (legacy mode)
- */
- public static Map<String, String> getContextHelpPagesLegacyLookupIndex() {
- return contextHelpPagesLegacyLookupIndex;
- }
-
- /**
- * @return Set containing all help pages using the combined format:
- * package.name:page_name.html
- */
- public static Set<String> getAllContextHelpPages() {
- return allContextHelpPages;
- }
-
- /**
- * Create a set of chelp pages that should not be indexed at all. This is
- * usefull to not show chelp pages of modules that are not enabled
- *
- * @return
- *
- * log.info("Excluding chelp path::" + strLine + " - found on blacklist::" + blackListFile.getAbsolutePath());
- */
-
-}
diff --git a/src/main/java/org/olat/core/commons/contextHelp/ContextHelpPageCrumbController.java b/src/main/java/org/olat/core/commons/contextHelp/ContextHelpPageCrumbController.java
deleted file mode 100644
index 6eafd91093c..00000000000
--- a/src/main/java/org/olat/core/commons/contextHelp/ContextHelpPageCrumbController.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/**
- * <a href="http://www.openolat.org">
- * OpenOLAT - Online Learning and Training</a><br>
- * <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 the
- * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
- * <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>
- * Initial code contributed and copyrighted by<br>
- * frentix GmbH, http://www.frentix.com
- * <p>
- */
-
-package org.olat.core.commons.contextHelp;
-
-import java.util.Locale;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.olat.core.commons.services.commentAndRating.CommentAndRatingDefaultSecurityCallback;
-import org.olat.core.commons.services.commentAndRating.CommentAndRatingSecurityCallback;
-import org.olat.core.commons.services.commentAndRating.ui.UserCommentsAndRatingsController;
-import org.olat.core.dispatcher.mapper.Mapper;
-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.generic.breadcrumb.CrumbBasicController;
-import org.olat.core.gui.media.ClasspathMediaResource;
-import org.olat.core.gui.media.MediaResource;
-import org.olat.core.gui.media.NotFoundMediaResource;
-import org.olat.core.gui.render.velocity.VelocityRenderDecorator;
-import org.olat.core.gui.translator.PackageTranslator;
-import org.olat.core.id.OLATResourceable;
-import org.olat.core.id.Roles;
-import org.olat.core.util.i18n.I18nModule;
-import org.olat.core.util.resource.OresHelper;
-
-/**
- * <h3>Description:</h3> The context help page crumb controller reads context help
- * files from the classpath and embedds them into a context help viewer.
- * <p>
- *
- * <h3>Events thrown by this controller:</h3> none
- * <p>
- * Initial Date: 30.10.2008 <br>
- *
- * @author Florian Gnaegi, frentix GmbH, http://www.frentix.com
- */
-
-class ContextHelpPageCrumbController extends CrumbBasicController {
- private VelocityContainer contextHelpWrapperVC;
- private VelocityContainer contextHelpPageVC;
- private PackageTranslator pageTranslator;
- private String bundleName = null, page = null;
- private String chelpStaticDirUrl;
-
- /**
- * Constructor for a context help details page. This renders a crumb with
- * the help page for the given bundle and page
- *
- * @param ureq
- * @param lwControl
- * @param bundleName
- * @param page
- * @param pageLocale
- */
- ContextHelpPageCrumbController(UserRequest ureq, WindowControl lwControl, String bundleName, String page, Locale pageLocale) {
- super(ureq, lwControl);
- setLocale(pageLocale, true);
-
- this.bundleName = bundleName;
- this.page = page;
- contextHelpWrapperVC = createVelocityContainer("contexthelpwrapper");
- // Initialize the page mapper - must be done before calling createHelpPage()
- initPageResourceMapper(ureq);
- pageTranslator = new PackageTranslator(bundleName, getLocale());
- contextHelpPageVC = createHelpPage(bundleName, page);
-
- // Add page infos and rating
- addPageInfos();
- addPageRating(ureq);
-
- if (contextHelpPageVC == null) {
- contextHelpWrapperVC.contextPut("page", ureq.getNonParsedUri());
- }
-
- putInitialPanel(contextHelpWrapperVC);
- }
-
- /**
- * Internal helper to initialize the mapper that provides context help
- * resources. The mapper tries it first with the language of the user, then
- * with the default language and last but not least with the fallback
- * language.
- */
- private void initPageResourceMapper(UserRequest ureq) {
- // Add page resources mapper
- Mapper pageResourceMapper = new Mapper() {
- public MediaResource handle(String relPath, HttpServletRequest request) {
- ClasspathMediaResource mr = null;
- // relPath: myimage.png
- int suffixPos = relPath.lastIndexOf(".");
- if (suffixPos > 0) {
- String mediaName = relPath.substring(0, suffixPos);
- //fxdiff FXOLAT-185:fix loading of files in jar
- if(mediaName.startsWith("/")) {
- mediaName = mediaName.substring(1, mediaName.length());
- }
- String postfix = relPath.substring(suffixPos);
- // 1) try it with current language
- String fileName = mediaName + "_" + getLocale().toString() + postfix;
- mr = new ClasspathMediaResource(Package.getPackage(bundleName), ContextHelpModule.CHELP_STATIC_DIR + fileName);
- // 2) try it with default language
- if (!mr.resourceExists()) {
- fileName = mediaName + "_" + I18nModule.getDefaultLocale().toString() + postfix;
- mr = new ClasspathMediaResource(Package.getPackage(bundleName), ContextHelpModule.CHELP_STATIC_DIR + fileName);
- }
- // 3) try it with fallback language
- if (!mr.resourceExists()) {
- fileName = mediaName + "_" + I18nModule.getFallbackLocale().toString() + postfix;
- mr = new ClasspathMediaResource(Package.getPackage(bundleName), ContextHelpModule.CHELP_STATIC_DIR + fileName);
- }
- }
- // If not even a fallback image is found, serve a not-found resource
- if (!mr.resourceExists()) {
- return new NotFoundMediaResource(relPath);
- }
- return mr;
- }
- };
- // we use user scope mappers because global mappers can only be instantiated once
- chelpStaticDirUrl = registerMapper(ureq, pageResourceMapper);
- }
-
- /**
- * Inernal helper to add some information about the currently loaded page.
- */
- private void addPageInfos() {
- if (contextHelpPageVC == null) {
- contextHelpWrapperVC.contextPut("pageFound", Boolean.FALSE);
- } else {
- contextHelpWrapperVC.contextPut("pageFound", Boolean.TRUE);
- contextHelpWrapperVC.put("contextHelpPage", contextHelpPageVC);
- contextHelpWrapperVC.contextPut("title", getCrumbLinkText());
- }
- }
-
- /**
- * Internal helper to add the page rating elements. If the user is not
- * authenticated or the feature is disabled in the configuration, no such
- * elements are added.
- *
- * @param ureq
- */
- private void addPageRating(UserRequest ureq) {
- if ( ! ContextHelpModule.isContextRatingEnabled()
- || ! ureq.getUserSession().isAuthenticated()
- || contextHelpPageVC == null ) return;
-
-
- Roles roles = ureq.getUserSession().getRoles();
- OLATResourceable helpOres = OresHelper.createOLATResourceableType("contexthelp");
- String key = pageTranslator.toString() + ":" + bundleName + ":" + page;
- CommentAndRatingSecurityCallback secCallback = new CommentAndRatingDefaultSecurityCallback(getIdentity(), roles.isOLATAdmin(), roles.isGuestOnly());
- UserCommentsAndRatingsController commentsAndRatingCtr = new UserCommentsAndRatingsController(ureq, getWindowControl(), helpOres, key, secCallback, true, true, true);
- listenTo(commentsAndRatingCtr);
- contextHelpWrapperVC.put("commentsAndRatingCtr", commentsAndRatingCtr.getInitialComponent());
- }
-
- /**
- * Helper to create the velocity page and initialize the page translator
- *
- * @param bundleName
- * @param pageName
- * @return
- */
- private VelocityContainer createHelpPage(String bundleName, String pageName) {
- if (bundleName == null || pageName == null) return null;
- String pagePath = bundleName.replace('.', '/') + ContextHelpModule.CHELP_DIR + pageName;
- if (getClass().getResource("/" + pagePath) == null) {
- logWarn("Context help page does not exist on path::" + pagePath, null);
- return null;
- }
- VelocityContainer container = new VelocityContainer("contextHelpPageVC", pagePath, pageTranslator, this);
- // add media directory url to context for resource delivery
- container.contextPut("chelpStaticDirUrl", chelpStaticDirUrl);
- return container;
- }
-
- /**
- * @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) {
- if (source == contextHelpPageVC) {
- // Must be a link to another help page, add to crumb path.
- String subPage = event.getCommand();
- String bundleParam = ureq.getParameter(VelocityRenderDecorator.PARAM_CHELP_BUNDLE);
- if (bundleParam == null) bundleParam = bundleName;
- // Add new crumb controller now. Old one is disposed automatically
- ContextHelpPageCrumbController pageCrumController = new ContextHelpPageCrumbController(ureq, getWindowControl(), bundleParam, subPage, getLocale());
- activateAndListenToChildCrumbController(pageCrumController);
- }
- }
-
- /**
- * @see org.olat.core.gui.control.DefaultController#doDispose()
- */
- protected void doDispose() {
- // controllers and mapper autodisposed by basic controller
- }
-
- /**
- * @see org.olat.core.gui.control.generic.breadcrumb.CrumbBasicController#getCrumbLinkHooverText()
- */
- public String getCrumbLinkHooverText() {
- return translate("contexthelp.crump.hover.prefix") + ": " + getCrumbLinkText();
- }
-
- /**
- * @see org.olat.core.gui.control.generic.breadcrumb.CrumbBasicController#getCrumbLinkText()
- */
- public String getCrumbLinkText() {
- return pageTranslator.translate("chelp." + page.split("\\.")[0] + ".title");
- }
-
- /**
- * Change the locale for this view
- * @param locale
- * @param ureq
- */
- public void setLocale(Locale locale, UserRequest ureq) {
- // Update wrapper container translator and for subsequent requests
- setLocale(locale, true);
- // Update page translator
- pageTranslator.setLocale(locale);
- // Re-translate page
- addPageInfos();
- addPageRating(ureq);
- // Update next crumb in chain
- ContextHelpPageCrumbController child = (ContextHelpPageCrumbController) getChildCrumbController();
- if (child != null) {
- child.setLocale(locale, ureq);
- }
- }
-
-}
diff --git a/src/main/java/org/olat/core/commons/contextHelp/ContextHelpTOCCrumbController.java b/src/main/java/org/olat/core/commons/contextHelp/ContextHelpTOCCrumbController.java
deleted file mode 100644
index 031d7f8996c..00000000000
--- a/src/main/java/org/olat/core/commons/contextHelp/ContextHelpTOCCrumbController.java
+++ /dev/null
@@ -1,196 +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.core.commons.contextHelp;
-
-import java.text.Collator;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import org.olat.core.gui.UserRequest;
-import org.olat.core.gui.components.Component;
-import org.olat.core.gui.components.link.Link;
-import org.olat.core.gui.components.link.LinkFactory;
-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.generic.breadcrumb.CrumbBasicController;
-import org.olat.core.gui.translator.PackageTranslator;
-
-/**
- * Description:<br>
- * The table of contents crumb controller shows the list of available context
- * help pages. The pages are rendered as links. If clicked, they will open up as
- * a new crumb on the bread crumb path
- * <p>
- * The controller can be activated with a page identifyer, e.g. with
- * <code>"org.olat.core:my-helppage.html"</code>
- *
- * <P>
- * Initial Date: 04.11.2008 <br>
- *
- * @author gnaegi
- */
-class ContextHelpTOCCrumbController extends CrumbBasicController {
- private VelocityContainer tocVC;
- private List<String> pageIdentifyers;
- private List<Link> pageLinks;
-
- /**
- * Constructor to create a new context help table of contents controller
- *
- * @param ureq
- * @param control
- * @param displayLocale
- */
- protected ContextHelpTOCCrumbController(UserRequest ureq, WindowControl control, Locale displayLocale) {
- super(ureq, control);
- setLocale(displayLocale, true);
- tocVC = createVelocityContainer("contexthelptoc");
-
- pageIdentifyers = new ArrayList<String>();
- pageLinks = new ArrayList<Link>();
- pageIdentifyers.addAll(ContextHelpModule.getAllContextHelpPages());
-
- sortToc();
-
- tocVC.contextPut("pageIdentifyers", pageIdentifyers);
-
- putInitialPanel(tocVC);
- }
-
- /**
- * @see org.olat.core.gui.control.generic.breadcrumb.CrumbBasicController#getCrumbLinkHooverText()
- */
- @Override
- public String getCrumbLinkHooverText() {
- return translate("contexthelp.crumb.toc.hover");
- }
-
- /**
- * @see org.olat.core.gui.control.generic.breadcrumb.CrumbBasicController#getCrumbLinkText()
- */
- @Override
- public String getCrumbLinkText() {
- return translate("contexthelp.crumb.toc");
- }
-
- /**
- * @see org.olat.core.gui.control.DefaultController#doDispose()
- */
- @Override
- protected void doDispose() {
- tocVC = null;
- pageIdentifyers = null;
- }
-
- /**
- * @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)
- */
- @Override
- protected void event(UserRequest ureq, Component source, Event event) {
- if (source instanceof Link) {
- Link link = (Link) source;
- // Get requested page from link
- String pageIdentifyer = (String) link.getUserObject();
- activatePage(ureq, pageIdentifyer);
- }
- }
-
- /**
- * Change the locale for this view
- * @param locale
- * @param ureq
- */
- public void setLocale(Locale locale, UserRequest ureq) {
- if (tocVC == null) {
- // already disposed
- return;
- }
- // Update locale for subsequent requests
- setLocale(locale, true);
-
- sortToc();
-
- // Update title in view
- tocVC.setDirty(true);
- // Update next crumb in chain
- ContextHelpPageCrumbController child = (ContextHelpPageCrumbController) getChildCrumbController();
- if (child != null) {
- child.setLocale(locale, ureq);
- }
- }
-
- private void sortToc () {
-
- Map <String,String> tmp = new HashMap<String,String>();
- Map <String,Link> links = new HashMap<String,Link>();
- List <String>titles = new ArrayList<String>();
-
- pageLinks.clear();
-
- for (int i = 0; i < pageIdentifyers.size(); i++) {
- String pageIdentifyer = pageIdentifyers.get(i);
- int splitPos = pageIdentifyer.indexOf(":");
- String bundleName = pageIdentifyer.substring(0, splitPos);
- String page = pageIdentifyer.substring(splitPos+1);
- PackageTranslator pageTans = new PackageTranslator(bundleName, getLocale());
- String pageTitle = pageTans.translate("chelp." + page.split("\\.")[0] + ".title");
- Link link = LinkFactory.createLink(i+"", tocVC, this);
- link.setCustomDisplayText(pageTitle);
- link.setUserObject(pageIdentifyer);
- pageLinks.add(link);
- tmp.put(pageTitle, pageIdentifyer);
- links.put(pageIdentifyer, link);
- titles.add(pageTitle);
- }
-
- Collator c = Collator.getInstance(getLocale());
- c.setStrength(Collator.TERTIARY);
- Collections.sort(titles, c);
-
- for (int i = 0; i < titles.size(); i++) {
- String pi = tmp.get(titles.get(i));
- tocVC.put(i+"", links.get(pi));
- }
- }
-
- public void activatePage(UserRequest ureq, String pageIdentifyer) {
- int splitPos = pageIdentifyer.indexOf(":");
- String bundleName = pageIdentifyer.substring(0, splitPos);
- String page = pageIdentifyer.substring(splitPos+1);
- activatePage(ureq, bundleName, page);
- }
-
- public void activatePage(UserRequest ureq, String bundleName, String page) {
- // Add new crumb controller now. Old one is disposed automatically
- ContextHelpPageCrumbController pageCrumController = new ContextHelpPageCrumbController(ureq, getWindowControl(), bundleName, page, getLocale());
- activateAndListenToChildCrumbController(pageCrumController);
- }
-
-}
diff --git a/src/main/java/org/olat/core/commons/contextHelp/ContextHelpTopNavController.java b/src/main/java/org/olat/core/commons/contextHelp/ContextHelpTopNavController.java
deleted file mode 100644
index 0ce8ff3d660..00000000000
--- a/src/main/java/org/olat/core/commons/contextHelp/ContextHelpTopNavController.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/**
- * <a href="http://www.openolat.org">
- * OpenOLAT - Online Learning and Training</a><br>
- * <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 the
- * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
- * <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>
- * Initial code contributed and copyrighted by<br>
- * frentix GmbH, http://www.frentix.com
- * <p>
- */
-package org.olat.core.commons.contextHelp;
-
-import java.util.Collection;
-import java.util.Locale;
-
-import org.olat.core.CoreSpringFactory;
-import org.olat.core.commons.chiefcontrollers.LanguageChangedEvent;
-import org.olat.core.commons.fullWebApp.DefaultMinimalTopNavController;
-import org.olat.core.commons.fullWebApp.LockableController;
-import org.olat.core.dispatcher.impl.StaticMediaDispatcher;
-import org.olat.core.gui.UserRequest;
-import org.olat.core.gui.Windows;
-import org.olat.core.gui.components.Window;
-import org.olat.core.gui.components.form.flexible.FormItem;
-import org.olat.core.gui.components.form.flexible.FormItemContainer;
-import org.olat.core.gui.components.form.flexible.FormUIFactory;
-import org.olat.core.gui.components.form.flexible.elements.FormLink;
-import org.olat.core.gui.components.form.flexible.elements.SingleSelection;
-import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
-import org.olat.core.gui.components.form.flexible.impl.FormEvent;
-import org.olat.core.gui.control.Controller;
-import org.olat.core.gui.control.WindowBackOffice;
-import org.olat.core.gui.control.WindowControl;
-import org.olat.core.gui.media.RedirectMediaResource;
-import org.olat.core.id.OLATResourceable;
-import org.olat.core.util.ArrayHelper;
-import org.olat.core.util.UserSession;
-import org.olat.core.util.Util;
-import org.olat.core.util.i18n.I18nManager;
-import org.olat.core.util.i18n.I18nModule;
-import org.olat.core.util.resource.OresHelper;
-import org.olat.search.SearchServiceUIFactory;
-import org.olat.search.SearchServiceUIFactory.DisplayOption;
-import org.olat.search.ui.SearchInputController;
-
-/**
- * <h3>Description:</h3> A simple top nav controller that features a close
- * window and print link and change language selector
- *
- * <h3>Events thrown by this controller:</h3>
- * <ul>
- * <li>LanguageChangedEvent when the language selector is used. The event is
- * fired in the channel CHANGE_LANG_RESOURCE</li>
- * </ul>
- * <p>
- * Initial Date: 04.11.2008 <br>
- *
- * @author Florian Gnaegi, frentix GmbH, http://www.frentix.com
- */
-public class ContextHelpTopNavController extends FormBasicController implements LockableController {
- static final OLATResourceable CHANGE_LANG_RESOURCE = OresHelper.createOLATResourceableType("ContextHelp:ChangeLanguageChannel");
-
- private SingleSelection langSelection;
- private FormLink closeLink;
- private SearchInputController searchController;
-
- /**
- * Constructor, creates a velocity page with the links and the selector
- *
- * @param ureq
- * @param wControl
- */
- public ContextHelpTopNavController(UserRequest ureq, WindowControl wControl) {
- super(ureq, wControl, "contexthelptopnav", Util.createPackageTranslator(DefaultMinimalTopNavController.class, ureq.getLocale()));
- // Get lang from URL
- String[] uriParts = ureq.getNonParsedUri().split("/");
- String lang = uriParts[0];
- Locale newLocale = I18nManager.getInstance().getLocaleOrNull(lang);
- if ( newLocale == null || !I18nModule.getEnabledLanguageKeys().contains(newLocale.toString())) {
- newLocale = I18nModule.getDefaultLocale();
- }
- setLocale(newLocale, true);
- // Initialize lang selection form
- initForm(ureq);
- }
-
- @Override
- public void lockResource(OLATResourceable resource) {
- //
- }
-
- @Override
- public void unlockResource() {
- //
- }
-
- @Override
- protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
- UserSession usess = ureq.getUserSession();
- if(usess != null && usess.getRoles() != null && usess.getIdentity() != null) {
- SearchServiceUIFactory searchUIFactory = (SearchServiceUIFactory)CoreSpringFactory.getBean(SearchServiceUIFactory.class);
- searchController = searchUIFactory.createInputController(ureq, getWindowControl(), DisplayOption.STANDARD, mainForm);
- searchController.setResourceContextEnable(false);
- searchController.setDocumentType("type.contexthelp");
- flc.add("search_input", searchController.getFormItem());
- }
-
- // Add target languages without overlays
- I18nManager i18nMgr = I18nManager.getInstance();
- Collection<String> availableLangKeys = I18nModule.getEnabledLanguageKeys();
- String[] targetlangKeys = ArrayHelper.toArray(availableLangKeys);
- String[] targetLangValues = new String[targetlangKeys.length];
- for (int i = 0; i < targetlangKeys.length; i++) {
- String key = targetlangKeys[i];
- String name = i18nMgr.getLanguageTranslated(key, I18nModule.isOverlayEnabled());
- targetLangValues[i] = name;
- }
- ArrayHelper.sort(targetlangKeys, targetLangValues, false, true, false);
- // Build css classes for reference languages
- langSelection = uifactory.addDropdownSingleselect("contexthelp.langSelection", formLayout, targetlangKeys, targetLangValues, null);
- langSelection.addActionListener(FormEvent.ONCHANGE);
- // Preselect language from URL
- langSelection.select(getLocale().toString(), true);
- flc.contextPut("lang", getLocale().toString());
- // Add window close link
- closeLink = FormUIFactory.getInstance().addFormLink("header.topnav.close", this.flc);
- }
-
-
- /**
- * @see org.olat.core.gui.components.form.flexible.impl.FormBasicController#formInnerEvent(org.olat.core.gui.UserRequest,
- * org.olat.core.gui.components.form.flexible.FormItem,
- * org.olat.core.gui.components.form.flexible.impl.FormEvent)
- */
- @Override
- protected void formInnerEvent(UserRequest ureq, FormItem source, FormEvent event) {
- if (source == closeLink) {
- // close window (a html page which calls Window.close onLoad
- ureq.getDispatchResult().setResultingMediaResource(
- new RedirectMediaResource(StaticMediaDispatcher.createStaticURIFor("closewindow.html")));
- // release all resources and close window
- WindowBackOffice wbo = getWindowControl().getWindowBackOffice();
- Window w = wbo.getWindow();
- Windows.getWindows(ureq).deregisterWindow(w);
- wbo.dispose();
-
- } else if (source == langSelection) {
- String langKey = langSelection.getSelectedKey();
- Locale locale = I18nManager.getInstance().getLocaleOrDefault(langKey);
- setLocale(locale, true);
- this.flc.contextPut("lang", getLocale().toString());
-
- // notify my children
- LanguageChangedEvent mue = new LanguageChangedEvent(locale, ureq);
- ureq.getUserSession().getSingleUserEventCenter().fireEventToListenersOf(mue, CHANGE_LANG_RESOURCE);
-
- }
- }
-
-
- @Override
- protected void formOK(UserRequest ureq) {
- // nothing to do
- }
-
-
- /**
- * @see org.olat.core.gui.control.DefaultController#doDispose()
- */
- @Override
- protected void doDispose() {
- if(searchController != null) {
- searchController.dispose();
- }
- }
-}
diff --git a/src/main/java/org/olat/core/commons/contextHelp/ContextHelpVisitor.java b/src/main/java/org/olat/core/commons/contextHelp/ContextHelpVisitor.java
deleted file mode 100644
index 52924665096..00000000000
--- a/src/main/java/org/olat/core/commons/contextHelp/ContextHelpVisitor.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/**
- * <a href="http://www.openolat.org">
- * OpenOLAT - Online Learning and Training</a><br>
- * <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 the
- * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
- * <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>
- * Initial code contributed and copyrighted by<br>
- * frentix GmbH, http://www.frentix.com
- * <p>
- */
-package org.olat.core.commons.contextHelp;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Enumeration;
-import java.util.Map;
-import java.util.Set;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-
-import org.olat.core.logging.LogDelegator;
-import org.olat.core.util.FileVisitor;
-
-/**
- * Description:<br>
- * This visitor adds all context help pages on the classpath to a lookup index
- * <p>
- * Initial Date: 30.10.2008 <br>
- *
- * @author Florian Gnaegi, frentix GmbH, http://www.frentix.com
- *
- * @author gnaegi
- */
-class ContextHelpVisitor extends LogDelegator implements FileVisitor {
- private static final String CHELP_DIR = "_chelp";
- private String basePath;
- private Map<String, String> contextHelpPagesLegacyLookupIndex;
- private Set<String> allContextHelpPages;
- private Set<String> blacklist;
-
- /**
- * Packag scope constructor
- *
- * @param basePathConfig
- * The base path to be subtracted from the file name to get the
- * classname
- * @param contextHelpPagesLegacyLookupIndex
- * hash map that offers a way to lookup the package of a page
- * when only the page name is known (used for legacy help pages)
- * @param allContextHelpPages
- * set that contains all help pages pathes
- * @param blacklist
- * Set of page pathes that should not be indexed
- */
- ContextHelpVisitor(String basePathConfig,
- Map<String, String> contextHelpPagesLegacyLookupIndex,
- Set<String> allContextHelpPages, Set<String> blacklist) {
- this.basePath = basePathConfig;
- this.contextHelpPagesLegacyLookupIndex = contextHelpPagesLegacyLookupIndex;
- this.allContextHelpPages = allContextHelpPages;
- this.blacklist = blacklist;
- }
-
- /**
- * @see org.olat.core.util.FileVisitor#visit(java.io.File)
- */
- public void visit(File file) {
- // collect all help files a drop-down list later;
- if (file.isFile()) { // regular file
- File parentFile = file.getParentFile();
- // 1) Check for files on source path
- if (parentFile.getName().equals(CHELP_DIR)) {
- String toBeChechedkFilName = file.getName();
- File grandParentFile = parentFile.getParentFile();
- String pPath = grandParentFile.getPath();
- // add one for the '/'
- String classPath = pPath.substring(basePath.length() + 1);
- char c = File.separatorChar;
- classPath = classPath.replace(c, '.');
- addHelpPageToList(toBeChechedkFilName, classPath);
-
- // 2) Check for files within jars
- } else if (file.getName().endsWith(".jar")) {
- JarFile jar;
- try {
- jar = new JarFile(file);
- Enumeration<JarEntry> jarEntries = jar.entries();
- // Check in all jars - maybe we have context help files in
- // jar resources
- while (jarEntries.hasMoreElements()) {
- JarEntry jarEntry = jarEntries.nextElement();
- String jarEntryName = jarEntry.getName();
- // TODO:FG: check for \\Â instead of / for windows, rare case
- if (jarEntryName.indexOf("/" + CHELP_DIR + "/") != -1) {
- if (!jarEntry.isDirectory()) {
- // Add file from jar to help page list
- // extract class name without trailing slashes
- int staticDirPos = jarEntryName.indexOf(CHELP_DIR);
- String packageName = jarEntryName.substring(0, staticDirPos - 1);
- packageName = packageName.replace("/", ".");
- String fileName = jarEntryName.substring(staticDirPos + CHELP_DIR.length() + 1);
- addHelpPageToList(fileName, packageName); }
- }
- }
- } catch (IOException e) {
- logError(
- "Error while searching for context help file in a jar",
- e);
- }
- }
- }
- // else ignore
- }
-
- private void addHelpPageToList(String toBeChechedkFilName, String classPath) {
- String combinedPath = classPath + ":" + toBeChechedkFilName;
- // on the blacklist of not to be indexed pages?
- for (String blackListItem : blacklist) {
- if (combinedPath.startsWith(blackListItem))
- return;
- }
- // already in the lookup index?
- if (allContextHelpPages.contains(combinedPath))
- return;
- // no, so add it to list of known help pages
- allContextHelpPages.add(combinedPath);
- // and add it also to lookup map
- if (contextHelpPagesLegacyLookupIndex.containsKey(toBeChechedkFilName)) {
- logDebug("Detected two help pages with the same name::"
- + toBeChechedkFilName
- + ", in package::"
- + contextHelpPagesLegacyLookupIndex.get(toBeChechedkFilName)
- + " and in package::"
- + classPath
- + ". Keeping the first one, legacy calls to second one will not work. To solve this, rename each help page to a unique name", null);
- } else {
- contextHelpPagesLegacyLookupIndex.put(toBeChechedkFilName, classPath);
- }
- }
-
-}
diff --git a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_ar.properties b/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_ar.properties
deleted file mode 100644
index 10bf615af77..00000000000
--- a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_ar.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-#Wed Jul 28 13:33:32 CEST 2010
-contexthelp.crumb.toc=\u0645\u062D\u062A\u0648\u064A\u0627\u062A \u0627\u0644\u062C\u062F\u0648\u0644
-contexthelp.crumb.toc.hover=\u0627\u0644\u0631\u062C\u0648\u0639 \u0625\u0644\u0649 \u0642\u0627\u0626\u0645\u0629 \u0643\u0644 \u0635\u0641\u062D\u0627\u062A \u0627\u0644\u0645\u0633\u0627\u0639\u062F\u0629
-contexthelp.crump.hover.prefix=\u0627\u0644\u0645\u0633\u0627\u0639\u062F\u0629 \u0637\u0628\u0642\u0627\u064B \u0644\u0644\u0645\u0648\u0636\u0648\u0639
-contexthelp.error.page.not.found=\u0644\u0627 \u064A\u0645\u0643\u0646 \u0627\u0644\u0639\u062B\u0648\u0631 \u0639\u0644\u0649 \u0635\u0641\u062D\u0629 \u0627\u0644\u0645\u0633\u0627\u0639\u062F\u0629 \u0627\u0644\u0645\u0637\u0644\u0648\u0628\u0629.
-contexthelp.langSelection=\u0627\u0644\u0644\u063A\u0629
-contexthelp.rating.title=\u0647\u0644 \u0647\u0630\u0647 \u0627\u0644\u0645\u0639\u0644\u0648\u0645\u0627\u062A \u0643\u0627\u0646\u062A \u0645\u0641\u064A\u062F\u0629\u061F
-contexthelp.toc.title=\u0645\u062D\u062A\u0648\u064A\u0627\u062A \u062C\u062F\u0648\u0644 \u0627\u0644\u0645\u0633\u0627\u0639\u062F\u0629 \u0639\u0628\u0631 \u0627\u0644\u0627\u0646\u062A\u0631\u0646\u062A
diff --git a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_bg.properties b/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_bg.properties
deleted file mode 100644
index d1cc23a7574..00000000000
--- a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_bg.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-#Wed Jul 28 13:33:31 CEST 2010
-contexthelp.crumb.toc=\u0421\u044A\u0434\u044A\u0440\u0436\u0430\u043D\u0438\u0435
-contexthelp.crumb.toc.hover=\u041D\u0430\u0437\u0430\u0434 \u043A\u044A\u043C \u0441\u043F\u0438\u0441\u044A\u043A\u0430 \u043D\u0430 \u0432\u0441\u0438\u0447\u043A\u0438 \u043F\u043E\u043C\u043E\u0449\u043D\u0438 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0438
-contexthelp.crump.hover.prefix=\u0422\u0435\u043C\u0430\u0442\u0438\u0447\u043D\u0430 \u043F\u043E\u043C\u043E\u0449
-contexthelp.error.page.not.found=\u0422\u044A\u0440\u0441\u0435\u043D\u0430\u0442\u0430 \u043F\u043E\u043C\u043E\u0449\u043D\u0430 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0430 \u043D\u0435 \u043C\u043E\u0436\u0435 \u0434\u0430 \u0431\u044A\u0434\u0435 \u043D\u0430\u043C\u0435\u0440\u0435\u043D\u0430.
-contexthelp.langSelection=\u0415\u0437\u0438\u043A
-contexthelp.rating.title=\u041F\u043E\u043B\u0435\u0437\u043D\u0430 \u043B\u0438 \u0431\u0435\u0448\u0435 \u0442\u0430\u0437\u0438 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F?
-contexthelp.toc.title=\u0421\u044A\u0434\u044A\u0440\u0436\u0430\u043D\u0438\u0435 \u043D\u0430 \u043E\u043D\u043B\u0430\u0439\u043D \u043F\u043E\u043C\u043E\u0449\u0430
diff --git a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_cs.properties b/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_cs.properties
deleted file mode 100644
index bd18aa5e906..00000000000
--- a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_cs.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-#Wed Jul 28 13:33:32 CEST 2010
-contexthelp.crumb.toc=Tabulka obsah\u016F
-contexthelp.crumb.toc.hover=Zp\u011Bt na seznam v\u0161ech str\u00E1nek n\u00E1pov\u011Bdy
-contexthelp.crump.hover.prefix=N\u00E1pov\u011Bda pro t\u00E9ma
-contexthelp.error.page.not.found=Po\u017Eadovan\u00E1 str\u00E1nka n\u00E1pov\u011Bdy nebyla nalezena.
-contexthelp.langSelection=Jazyk
-contexthelp.rating.title=Byla tato informace u\u017Eite\u010Dn\u00E1?
-contexthelp.toc.title=Tabulka on-line n\u00E1pov\u011Bdy
diff --git a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_de.properties
deleted file mode 100644
index 235b75908e2..00000000000
--- a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_de.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-#Mon Mar 02 09:54:04 CET 2009
-contexthelp.crumb.toc=Inhaltsverzeichnis
-contexthelp.crumb.toc.hover=Zur\u00FCck zur Liste aller Hilfeseiten
-contexthelp.crump.hover.prefix=Hilfe zum Thema
-contexthelp.error.page.not.found=Die Hilfeseite wurde nicht gefunden.
-contexthelp.langSelection=Sprache
-contexthelp.rating.title=War diese Information hilfreich?
-contexthelp.toc.title=Online Hilfe Inhaltsverzeichnis
diff --git a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_el.properties b/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_el.properties
deleted file mode 100644
index 3acfa6e3d44..00000000000
--- a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_el.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-#Wed Jul 28 13:33:32 CEST 2010
-contexthelp.crumb.toc=\u03A0\u03B5\u03C1\u03B9\u03B5\u03C7\u03CC\u03BC\u03B5\u03BD\u03B1
-contexthelp.crumb.toc.hover=\u03A0\u03AF\u03C3\u03C9 \u03C3\u03C4\u03B7 \u03BB\u03AF\u03C3\u03C4\u03B1 \u03CC\u03BB\u03C9\u03BD \u03C4\u03C9\u03BD \u03C3\u03B5\u03BB\u03AF\u03B4\u03C9\u03BD \u03B2\u03BF\u03AE\u03B8\u03B5\u03B9\u03B1\u03C2
-contexthelp.crump.hover.prefix=\u0392\u03BF\u03AE\u03B8\u03B5\u03B9\u03B1 \u03B3\u03B9\u03B1 \u03C4\u03BF \u03B8\u03AD\u03BC\u03B1
-contexthelp.error.page.not.found=\u0397 \u03C3\u03B5\u03BB\u03AF\u03B4\u03B1 \u03B2\u03BF\u03AE\u03B8\u03B5\u03B9\u03B1\u03C2 \u03B4\u03B5 \u03B2\u03C1\u03AD\u03B8\u03B7\u03BA\u03B5.
-contexthelp.langSelection=\u0393\u03BB\u03CE\u03C3\u03C3\u03B1
-contexthelp.rating.title=\u03A3\u03B1\u03C2 \u03B2\u03BF\u03AE\u03B8\u03B7\u03C3\u03B5 \u03B1\u03C5\u03C4\u03AE \u03B7 \u03C0\u03BB\u03B7\u03C1\u03BF\u03C6\u03BF\u03C1\u03AF\u03B1;
-contexthelp.toc.title=\u03A0\u03B5\u03C1\u03B9\u03B5\u03C7\u03CC\u03BC\u03B5\u03BD\u03B1 Online \u03B2\u03BF\u03AE\u03B8\u03B5\u03B9\u03B1\u03C2
diff --git a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_en.properties
deleted file mode 100644
index 541ef9ddd3c..00000000000
--- a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_en.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-#Thu Jan 20 20:12:06 CET 2011
-contexthelp.crumb.toc=Table of contents
-contexthelp.crumb.toc.hover=Back to the list of all help pages
-contexthelp.crump.hover.prefix=Help for topic
-contexthelp.error.page.not.found=The help page requested could not be found.
-contexthelp.langSelection=Language
-contexthelp.rating.title=Was this information helpful?
-contexthelp.toc.title=Online help table of contents
diff --git a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_es.properties b/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_es.properties
deleted file mode 100644
index 0b33245af5b..00000000000
--- a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_es.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-#Wed Jul 28 13:33:33 CEST 2010
-contexthelp.crumb.toc=Tabla de contenidos
-contexthelp.crumb.toc.hover=Regresar a la lista de todas las p\u00E1ginas de ayuda
-contexthelp.crump.hover.prefix=Tema de ayuda
-contexthelp.error.page.not.found=La p\u00E1gina de ayuda solicitada no se encontr\u00F3.
-contexthelp.langSelection=Idioma
-contexthelp.rating.title=\u00BFLe ha sido \u00FAtil esta informaci\u00F3n?
-contexthelp.toc.title=Tabla de contenidos de ayuda online
diff --git a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_fr.properties
deleted file mode 100644
index 2bac9c2b39c..00000000000
--- a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_fr.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-#Wed Jul 28 13:33:31 CEST 2010
-contexthelp.crumb.toc=Table de contenu
-contexthelp.crumb.toc.hover=Retour \u00E0 la liste de tous les pages d'aide.
-contexthelp.crump.hover.prefix=Aide au sujet
-contexthelp.error.page.not.found=La page d'aide n'a pas \u00E9t\u00E9 trouv\u00E9.
-contexthelp.langSelection=Langue
-contexthelp.rating.title=Est-ce que cette information vous a \u00E9t\u00E9 utile?
-contexthelp.toc.title=Table des mati\u00E8res de l'aide en ligne
diff --git a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_it.properties
deleted file mode 100644
index 0290cdee30b..00000000000
--- a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_it.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-#Fri Sep 03 14:58:38 CEST 2010
-contexthelp.crumb.toc=Indice del contenuto
-contexthelp.crumb.toc.hover=Ritorna alla lista delle pagine d'aiuto
-contexthelp.crump.hover.prefix=Aiuto sul tema
-contexthelp.error.page.not.found=La pagina d'aiuto non \u00E8 stata trovata.
-contexthelp.langSelection=Lingua
-contexthelp.rating.title=Questa informazione Le \u00E8 stata utile?
-contexthelp.toc.title=Indice del contenuto dell'aiuto online
diff --git a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_jp.properties b/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_jp.properties
deleted file mode 100644
index 30848425d2d..00000000000
--- a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_jp.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-#Wed Jul 28 13:33:30 CEST 2010
-contexthelp.crumb.toc=\u76EE\u6B21
-contexthelp.crumb.toc.hover=\u3059\u3079\u3066\u306E\u30D8\u30EB\u30D7\u30D5\u30A1\u30A4\u30EB\u4E00\u89A7\u30DA\u30FC\u30B8\u306B\u623B\u308B
-contexthelp.crump.hover.prefix=\u30C8\u30D4\u30C3\u30AF\u306E\u30D8\u30EB\u30D7
-contexthelp.error.page.not.found=\u8981\u6C42\u3055\u308C\u305F\u30D8\u30EB\u30D7\u30DA\u30FC\u30B8\u306F\u3001\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002
-contexthelp.langSelection=\u8A00\u8A9E
-contexthelp.rating.title=\u3053\u306E\u60C5\u5831\u306F\u3001\u5F79\u306B\u7ACB\u3061\u307E\u3057\u305F\u304B?
-contexthelp.toc.title=\u30AA\u30F3\u30E9\u30A4\u30F3\u30D8\u30EB\u30D7\u76EE\u6B21
diff --git a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_lt.properties b/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_lt.properties
deleted file mode 100644
index b066389af37..00000000000
--- a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_lt.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-#Wed Jul 28 13:33:30 CEST 2010
-contexthelp.crumb.toc=Turinys
-contexthelp.crumb.toc.hover=Gr\u012F\u017Et\u012F \u012F vis\u0173 pagalbos puslapi\u0173 s\u0105ra\u0161\u0105
-contexthelp.crump.hover.prefix=Temos pagalba
-contexthelp.error.page.not.found=Pra\u0161omas pagalbos puslapis nerastas.
-contexthelp.langSelection=Kalba
-contexthelp.rating.title=Ar buvo \u0161i informacija naudinga?
-contexthelp.toc.title=Internetinis pagalbos turinys
diff --git a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_nl_NL.properties b/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_nl_NL.properties
deleted file mode 100644
index b56a7fa838c..00000000000
--- a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_nl_NL.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-#Wed Jul 28 13:33:33 CEST 2010
-contexthelp.crumb.toc=Inhoudsopgave
-contexthelp.crumb.toc.hover=terug naar de lijst met alle help pagina's
-contexthelp.crump.hover.prefix=Thema help
-contexthelp.error.page.not.found=De gevraagde help pagina kan niet worden gevonden
-contexthelp.langSelection=Taal
-contexthelp.rating.title=Heeft deze informatie u geholpen?
-contexthelp.toc.title=Inhoudsopgave online help
diff --git a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_pl.properties b/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_pl.properties
deleted file mode 100644
index 0c1bd733f26..00000000000
--- a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_pl.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-#Wed Jul 28 13:33:32 CEST 2010
-contexthelp.crumb.toc=Spis tre\u015Bci
-contexthelp.crumb.toc.hover=Powr\u00F3t do listy wszystkich stron pomocy
-contexthelp.crump.hover.prefix=Pomoc do tematu
-contexthelp.error.page.not.found=\u017B\u0105dana strona pomocy nie zosta\u0142a odnaleziona.
-contexthelp.langSelection=J\u0119zyk
-contexthelp.rating.title=Czy ta informacja by\u0142a pomocna?
-contexthelp.toc.title=Spis tre\u015Bci pomocy online
diff --git a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_pt_BR.properties
deleted file mode 100644
index 530b8d2b6a1..00000000000
--- a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_pt_BR.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-#Wed Jul 28 13:33:29 CEST 2010
-contexthelp.crumb.toc=Tabela de conte\u00FAdos
-contexthelp.crumb.toc.hover=Devolta a lista de todas as p\u00E1gina de ajuda
-contexthelp.crump.hover.prefix=Ajuda para t\u00F3pico
-contexthelp.error.page.not.found=A p\u00E1gina de ajuda solicitada n\u00E3o pode ser encontrada
-contexthelp.langSelection=Idioma
-contexthelp.rating.title=Essa informa\u00E7\u00E3o foi \u00FAtil?
-contexthelp.toc.title=Tabela de conte\u00FAdo de ajuda Online
diff --git a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_ru.properties b/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_ru.properties
deleted file mode 100644
index 047175868af..00000000000
--- a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_ru.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-#Wed Jul 28 13:33:33 CEST 2010
-contexthelp.crumb.toc=\u0421\u043E\u0434\u0435\u0440\u0436\u0430\u043D\u0438\u0435
-contexthelp.crumb.toc.hover=\u041D\u0430\u0437\u0430\u0434 \u043A \u0441\u043F\u0438\u0441\u043A\u0443 \u0432\u0441\u0435\u0445 \u0441\u043F\u0440\u0430\u0432\u043E\u0447\u043D\u044B\u0445 \u0441\u0442\u0440\u0430\u043D\u0438\u0446
-contexthelp.crump.hover.prefix=\u0421\u043F\u0440\u0430\u0432\u043A\u0430 \u043A \u0442\u0435\u043C\u0435
-contexthelp.error.page.not.found=\u0421\u043F\u0440\u0430\u0432\u043E\u0447\u043D\u0430\u044F \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0430 \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D\u0430.
-contexthelp.langSelection=\u042F\u0437\u044B\u043A
-contexthelp.rating.title=\u0411\u044B\u043B\u0430 \u044D\u0442\u0430 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F \u043F\u043E\u043B\u0435\u0437\u043D\u0430?
-contexthelp.toc.title=\u0421\u043E\u0434\u0435\u0440\u0436\u0430\u043D\u0438\u0435 \u043E\u043D\u043B\u0430\u0439\u043D \u0441\u043F\u0440\u0430\u0432\u043A\u0438
diff --git a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_sq.properties b/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_sq.properties
deleted file mode 100644
index aa9c9187ea5..00000000000
--- a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_sq.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-#Wed Jul 28 13:33:32 CEST 2010
-contexthelp.crumb.toc=P\u00EBrmbajtja
-contexthelp.crumb.toc.hover=Kthehu e lista e t\u00EB gjith\u00EB faqeve t\u00EB ndihm\u00EBs
-contexthelp.crump.hover.prefix=Ndihma p\u00EBr tem\u00EBn
-contexthelp.error.page.not.found=Faqja e k\u00EBrkuar e ndihm\u00EBs nuk mund t\u00EB gjendet.
-contexthelp.langSelection=Gjuha
-contexthelp.rating.title=A ishte ky informacion i dobish\u00EBm?
-contexthelp.toc.title=P\u00EBrmbajtja e ndihm\u00EBs n\u00EB linj\u00EB
diff --git a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_zh_CN.properties
deleted file mode 100644
index 40518b7143d..00000000000
--- a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_zh_CN.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-#Wed Jul 28 13:33:30 CEST 2010
-contexthelp.crumb.toc=\u5185\u5BB9\u8868
-contexthelp.crumb.toc.hover=\u8FD4\u56DE\u5230\u6240\u6709\u5E2E\u52A9\u9875\u5217\u8868
-contexthelp.crump.hover.prefix=\u5E2E\u52A9\u7684\u4E3B\u9898
-contexthelp.error.page.not.found=\u65E0\u6CD5\u627E\u5230\u8981\u6C42\u7684\u5E2E\u52A9\u9875\u9762
-contexthelp.langSelection=\u8BED\u8A00
-contexthelp.rating.title=\u6B64\u4FE1\u606F\u6709\u5E2E\u52A9\u5417\uFF1F
-contexthelp.toc.title=\u5185\u5BB9\u8868\u5728\u7EBF\u5E2E\u52A9
diff --git a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_zh_TW.properties b/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_zh_TW.properties
deleted file mode 100644
index 1550e85487d..00000000000
--- a/src/main/java/org/olat/core/commons/contextHelp/_i18n/LocalStrings_zh_TW.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-#Wed Jul 28 13:33:31 CEST 2010
-contexthelp.crumb.toc=\u5167\u5BB9\u5927\u7DB1
-contexthelp.crumb.toc.hover=\u56DE\u5230\u6240\u6709\u8AAA\u660E\u9801\u9762\u7684\u6E05\u55AE
-contexthelp.crump.hover.prefix=\u5C0D\u65BC\u4E3B\u984C\u7684\u8AAA\u660E
-contexthelp.error.page.not.found=\u627E\u4E0D\u5230\u6240\u8981\u6C42\u7684\u8AAA\u660E\u9801\u9762\u3002
-contexthelp.langSelection=\u8A9E\u8A00
-contexthelp.rating.title=\u9019\u500B\u8CC7\u8A0A\u662F\u5426\u6709\u5E6B\u52A9\uFF1F
-contexthelp.toc.title=\u7DDA\u4E0A\u8AAA\u660E\u5167\u5BB9\u5927\u7DB1
diff --git a/src/main/java/org/olat/core/commons/contextHelp/_i18n/i18nBundleMetadata.properties b/src/main/java/org/olat/core/commons/contextHelp/_i18n/i18nBundleMetadata.properties
deleted file mode 100644
index 8cf7355ef3e..00000000000
--- a/src/main/java/org/olat/core/commons/contextHelp/_i18n/i18nBundleMetadata.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-#Tue Feb 17 16:34:09 CET 2009
-bundle.priority=200
diff --git a/src/main/java/org/olat/core/commons/contextHelp/_spring/contextHelpCorecontext.xml b/src/main/java/org/olat/core/commons/contextHelp/_spring/contextHelpCorecontext.xml
deleted file mode 100644
index ca3b2de6e20..00000000000
--- a/src/main/java/org/olat/core/commons/contextHelp/_spring/contextHelpCorecontext.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-<bean id="contextHelpModule" class="org.olat.core.commons.contextHelp.ContextHelpModule" destroy-method="destroy" >
- <property name="persistedProperties">
- <bean class="org.olat.core.configuration.PersistedProperties" scope="prototype" init-method="init" destroy-method="destroy">
- <constructor-arg index="0" ref="coordinatorManager"/>
- <constructor-arg index="1" ref="contextHelpModule" />
- </bean>
- </property>
- <property name="CHelpBlacklist">
- <!--
- The context help blacklist is used to specify context help pages
- that should not be used in the context help index page. This is useful
- if a certain software module is not enabled and thus the context help
- must not confuse users.
- Add one reference per line. Lines starting with the #-sign are ignored
- A context help is referenced like this: package.name:page.html
-
- Example:
- org.olat.core.demo -> exclude all pages in this package
- org.olat.core.demo:chelp-demo.html -> exclude exactly this page
- -->
- <set>
- <value>de.bps.course.nodes.den</value>
- </set>
- </property>
-</bean>
-
-<bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
- <property name="targetObject" ref="contextHelpModule" />
- <property name="targetMethod" value="init" />
- <property name="arguments">
- <value>
- <!-- global on/off of context help -->
- contextHelpEnabled=${help.context.enabled}
- <!-- allow users to rate entries in the help (helpful, not helpful) -->
- ratingEnabled=${help.context.rating.enabled}
- </value>
- </property>
-</bean>
-
-
-</beans>
\ No newline at end of file
diff --git a/src/main/java/org/olat/core/dispatcher/_spring/dispatcherContext.xml b/src/main/java/org/olat/core/dispatcher/_spring/dispatcherContext.xml
index 30cb0687c82..dfa21c66b9a 100644
--- a/src/main/java/org/olat/core/dispatcher/_spring/dispatcherContext.xml
+++ b/src/main/java/org/olat/core/dispatcher/_spring/dispatcherContext.xml
@@ -37,9 +37,6 @@
<entry key="/admin.html">
<ref bean="adminbean" />
</entry>
- <entry key="/help/">
- <ref bean="contexthelpbean" />
- </entry>
<entry key="/qti/">
<ref bean="secstaticlegacybean" />
</entry>
@@ -202,13 +199,6 @@
</constructor-arg>
</bean>
- <bean id="contexthelpbean"
- class="org.olat.core.commons.contextHelp.ContextHelpDispatcher">
- <constructor-arg index="0">
- <value>/help/</value>
- </constructor-arg>
- </bean>
-
<bean id="secstaticlegacybean"
class="org.olat.commons.servlets.StaticsLegacyDispatcher" />
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 381e0af488c..e6038dd7772 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
@@ -38,7 +38,6 @@ import java.util.UUID;
import org.apache.commons.lang.StringEscapeUtils;
import org.olat.core.CoreSpringFactory;
-import org.olat.core.commons.contextHelp.ContextHelpModule;
import org.olat.core.commons.services.help.HelpModule;
import org.olat.core.gui.components.Component;
import org.olat.core.gui.components.form.flexible.impl.NameValuePair;
@@ -71,6 +70,7 @@ public class VelocityRenderDecorator implements Closeable {
private Renderer renderer;
private final boolean isIframePostEnabled;
private StringOutput target;
+ private HelpModule helpModule;
/**
* @param renderer
@@ -81,6 +81,7 @@ public class VelocityRenderDecorator implements Closeable {
this.vc = vc;
this.target = target;
this.isIframePostEnabled = renderer.getGlobalSettings().getAjaxFlags().isIframePostEnabled();
+ this.helpModule = CoreSpringFactory.getImpl(HelpModule.class);
}
@Override
@@ -332,49 +333,17 @@ public class VelocityRenderDecorator implements Closeable {
return doRender(componentName, null);
}
- /**
- * used to position help icon inside div-class o_chelp_wrapper
- * @param packageName
- * @param pageName
- * @param hoverTextKey
- * @return
- */
- public StringOutput contextHelpWithWrapper(String packageName, String pageName, String hoverTextKey) {
- StringOutput sb = new StringOutput(100);
- if (ContextHelpModule.isContextHelpEnabled()) {
- sb.append("<span class=\"o_chelp_wrapper\">");
- sb.append(contextHelp(packageName, pageName, hoverTextKey));
- sb.append("</span>");
- }
- return sb;
- }
/**
- * @param packageName
- * @param pageName
- * @param hoverTextKey
+ * Create a link wrapped with some markup to render a nice help button. The
+ * link points to the corresponding page in the manual.
+ *
+ * @param page Help page name
* @return
*/
- public StringOutput contextHelp(String packageName, String pageName, String hoverTextKey) {
- StringOutput sb = new StringOutput(100);
- if (ContextHelpModule.isContextHelpEnabled()) {
- String hooverText = renderer.getTranslator().translate(hoverTextKey);
- if (hooverText != null) {
- hooverText = StringEscapeUtils.escapeHtml(hooverText);
- }
- sb.append("<a href=\"javascript:");
- sb.append(contextHelpJSCommand(packageName, pageName));
- sb.append("\" title=\"").append(hooverText).append("\" class=\"o_chelp\"><i class='o_icon o_icon_help'></i> ");
- sb.append(renderer.getTranslator().translate("help"));
- sb.append("</a>");
- }
- return sb;
- }
-
public StringOutput contextHelpWithWrapper(String page) {
StringOutput sb = new StringOutput(192);
- if (ContextHelpModule.isContextHelpEnabled()) {
- HelpModule helpModule = CoreSpringFactory.getImpl(HelpModule.class);
+ if (helpModule.isHelpEnabled()) {
Locale locale = renderer.getTranslator().getLocale();
String url = helpModule.getHelpProvider().getURL(locale, page);
if(url != null) {
@@ -390,103 +359,38 @@ public class VelocityRenderDecorator implements Closeable {
}
/**
- * Create a js command to open a specific context help page
- * @param packageName
- * @param pageName
+ * Create a js command to open a specific page in the manual.
+ *
+ * @param page Help page name
* @return
*/
- public StringOutput contextHelpJSCommand(String packageName, String pageName) {
+ public StringOutput contextHelpJSCommand(String page) {
StringOutput sb = new StringOutput(100);
- if (ContextHelpModule.isContextHelpEnabled()) {
- String langCode = renderer.getTranslator().getLocale().toString();
- sb.append("contextHelpWindow('");
- Renderer.renderNormalURI(sb, "help/");
- sb.append(langCode).append("/").append(packageName).append("/").append(pageName);
- sb.append("')");
+ if (helpModule.isHelpEnabled()) {
+ Locale locale = renderer.getTranslator().getLocale();
+ String url = helpModule.getHelpProvider().getURL(locale, page);
+ sb.append("contextHelpWindow('").append(url).append("')");
}
return sb;
}
/**
- * create a link to open a specifc context help page
- * @param page
+ * Create a link to a specific page in the manual. The link points to the
+ * corresponding page in the manual.
+ *
+ * @param page
+ * Help page name
*/
public StringOutput contextHelpLink(String page) {
StringOutput sb = new StringOutput(100);
- if (ContextHelpModule.isContextHelpEnabled()) {
- HelpModule helpModule = CoreSpringFactory.getImpl(HelpModule.class);
+ if (helpModule.isHelpEnabled()) {
String url = helpModule.getHelpProvider().getURL(renderer.getTranslator().getLocale(), page);
sb.append(url);
}
return sb;
}
- /**
- * Create a link that can be used within a context help page to link to
- * another context help page from the same package.
- *
- * @param pageName e.g. "my-page.html"
- * @return
- */
- public StringOutput contextHelpRelativeLink(String pageName) {
- return contextHelpRelativeLink(null, pageName);
- }
-
- /**
- * Create a link that can be used within a context help page to link to
- * another context help page from another package. As link text the page title
- * is used.
- *
- * @param bundleName e.g. "org.olat.core"
- * @param pageName e.g. "my-page.html"
- * @return
- */
- public StringOutput contextHelpRelativeLink(String bundleName, String pageName) {
- String linkText;
- int lastDotPos = pageName.lastIndexOf(".");
- if (lastDotPos != -1) {
- Translator pageTrans = renderer.getTranslator();
- if (bundleName != null) {
- Locale locale = pageTrans.getLocale();
- pageTrans = new PackageTranslator(bundleName, locale);
- }
- linkText = pageTrans.translate("chelp." + pageName.subSequence(0, lastDotPos) + ".title");
- } else {
- linkText = pageName; // fallback
- }
- return contextHelpRelativeLink(bundleName, pageName, linkText);
- }
-
- /**
- * Create a link that can be used within a context help page to link to
- * another context help page from another package. The link text can be
- * specified as a thirt attribute.
- *
- * @param bundleName e.g. "org.olat.core"
- * @param pageName e.g. "my-page.html"
- * @return
- */
- public StringOutput contextHelpRelativeLink(String bundleName, String pageName, String linkText) {
- StringOutput sb = new StringOutput(100);
- if (ContextHelpModule.isContextHelpEnabled()) {
- sb.append("<a ");
- NameValuePair[] commands;
- if (bundleName == null) {
- commands = new NameValuePair[]{ new NameValuePair(VelocityContainer.COMMAND_ID, pageName) };
- } else {
- commands = new NameValuePair[]{
- new NameValuePair(VelocityContainer.COMMAND_ID, pageName),
- new NameValuePair(PARAM_CHELP_BUNDLE, bundleName)
- };
- }
- renderer.getUrlBuilder().buildHrefAndOnclick(sb, isIframePostEnabled, commands);
- sb.append(">").append(linkText).append("</a>");
- }
- return sb;
- }
-
-
/**
* @param componentName
* @param arg1
diff --git a/src/main/java/org/olat/core/util/i18n/ui/TranslationToolLauncherController.java b/src/main/java/org/olat/core/util/i18n/ui/TranslationToolLauncherController.java
index 9be7b93aa73..ea3789dfcad 100644
--- a/src/main/java/org/olat/core/util/i18n/ui/TranslationToolLauncherController.java
+++ b/src/main/java/org/olat/core/util/i18n/ui/TranslationToolLauncherController.java
@@ -20,7 +20,6 @@
package org.olat.core.util.i18n.ui;
-import org.olat.core.commons.contextHelp.ContextHelpModule;
import org.olat.core.commons.fullWebApp.popup.BaseFullWebappPopupLayoutFactory;
import org.olat.core.gui.UserRequest;
import org.olat.core.gui.components.Component;
@@ -112,9 +111,8 @@ public class TranslationToolLauncherController extends BasicController {
setNewInlineStatus(ureq, false);
} else if (source == cacheFlushLink) {
- // clear i18n chache and refresh context help index
+ // clear i18n cache
I18nModule.reInitializeAndFlushCache();
- ContextHelpModule.refreshContextHelpIndex();
showInfo("cache.flush.ok");
}
}
diff --git a/src/main/java/org/olat/gui/control/OlatDmzTopNavController.java b/src/main/java/org/olat/gui/control/OlatDmzTopNavController.java
index 5e97647b56c..348db7565d1 100644
--- a/src/main/java/org/olat/gui/control/OlatDmzTopNavController.java
+++ b/src/main/java/org/olat/gui/control/OlatDmzTopNavController.java
@@ -25,7 +25,6 @@
package org.olat.gui.control;
import org.olat.core.commons.chiefcontrollers.LanguageChooserController;
-import org.olat.core.commons.contextHelp.ContextHelpModule;
import org.olat.core.commons.controllers.impressum.ImpressumDmzMainController;
import org.olat.core.commons.controllers.impressum.ImpressumInformations;
import org.olat.core.commons.controllers.impressum.ImpressumModule;
@@ -50,7 +49,6 @@ import org.springframework.beans.factory.annotation.Autowired;
public class OlatDmzTopNavController extends BasicController implements LockableController {
- private static final Boolean contextHelpEnabled = Boolean.valueOf(ContextHelpModule.isContextHelpEnabled());
private Link impressumLink, aboutLink;
private LanguageChooserController languageChooserC;
@@ -73,11 +71,13 @@ public class OlatDmzTopNavController extends BasicController implements Lockable
impressumLink.setTarget("_blank");
// help on login page
- vc.contextPut("isContextHelpEnabled", contextHelpEnabled);
if (helpModule.isHelpEnabled()) {
HelpLinkSPI provider = helpModule.getHelpProvider();
- Component helpLink = provider.getHelpPageLink(ureq, translate("help.manual"), translate("help.manual"), "o_icon o_icon-wf o_icon_manual", null, "Login page");
+ Component helpLink = provider.getHelpPageLink(ureq, translate("topnav.help"), translate("topnav.help.alt"), "o_icon o_icon-wf o_icon_help", null, "Login Page");
vc.put("topnav.help", helpLink);
+
+ Component browsercheckLink = provider.getHelpPageLink(ureq, translate("topnav.check"), translate("topnav.check.alt"), "o_icon o_icon-wf o_icon_browsercheck", null, "Login Page#login_browsercheck");
+ vc.put("topnav.browsercheck", browsercheckLink);
}
// about link
aboutLink = AboutController.aboutLinkFactory(getLocale(), this, true, false);
diff --git a/src/main/java/org/olat/gui/control/_content/dmztopnav.html b/src/main/java/org/olat/gui/control/_content/dmztopnav.html
index ea79fb48dcd..443e79e372d 100644
--- a/src/main/java/org/olat/gui/control/_content/dmztopnav.html
+++ b/src/main/java/org/olat/gui/control/_content/dmztopnav.html
@@ -8,22 +8,13 @@
<i class="o_icon o_icon_help o_icon-lg"></i> $r.translate("topnav.help")
</a>
<ul class="dropdown-menu dropdown-menu-right">
- #if ($isContextHelpEnabled)
- <li><a href="$r.contextHelpLink("Login Page")" target="_blank" title="$r.translateInAttribute("topnav.help.alt")">
- <i class="o_icon o_icon_help o_icon-fw"></i> <span>$r.translate("topnav.help")</span></a></li>
- #if($r.available("topnav.help"))
- <li id="o_navbar_help">
- $r.render("topnav.help")
- </li>
- #end
- <li><a href="$r.contextHelpLink("Login Page#login_browsercheck")" target="_blank" title="$r.translateWithPackage("org.olat.login","menu.check.alt")">
- <i class="o_icon o_icon_browsercheck o_icon-fw"></i> <span>$r.translateWithPackage("org.olat.login","menu.check")</span></a></li>
- #else
- #if($r.available("topnav.help"))
+ #if($r.available("topnav.help"))
<li id="o_navbar_help">
$r.render("topnav.help")
</li>
- #end
+ <li>
+ $r.render("topnav.browsercheck")
+ </li>
#end
<li id="o_navbar_about">
$r.render("topnav.about")
diff --git a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_ar.properties b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_ar.properties
index 4fa167e5a8a..9dee07c9001 100644
--- a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_ar.properties
+++ b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_ar.properties
@@ -1,9 +1,11 @@
-#Sun Feb 14 14:24:03 CET 2010
+#Wed Nov 04 23:14:08 CET 2015
command.closeprinting=\u0625\u063A\u0644\u0627\u0642 \u0645\u0639\u0627\u064A\u0646\u0629 \u0627\u0644\u0637\u0628\u0627\u0639\u0629
footer.ajax.hover=\u0627\u0644\u0648\u0636\u0639 AJAX\r\n\u0646\u0634\u0637 -- \u0645\u0645\u0627 \u064A\u0639\u0646\u0649 \u0627\u0633\u062A\u062C\u0627\u0628\u0629 \u0633\u0631\u064A\u0639\u0629 \u0639\u0646\u062F \u0627\u0644\u0639\u0645\u0644 \u0641\u0649 \u0623\u0648\u0644\u0627\u062A
footer.login=\u062F\u062E\u0648\u0644
not.logged.in=\u0644\u0645 \u062A\u0642\u0645 \u0628\u062A\u0633\u062C\u064A\u0644 \u0627\u0644\u062F\u062E\u0648\u0644
other.users.online=\u0627\u0644\u0623\u0634\u062E\u0627\u0635 \u0627\u0644\u0645\u062A\u0648\u0627\u062C\u062F\u0648\u0646 \u0639\u0628\u0631 \u0627\u0644\u0627\u0646\u062A\u0631\u0646\u062A
+topnav.check=\u0641\u062D\u0635 \u0627\u0644\u0645\u062A\u0635\u0641\u062D
+topnav.check.alt=\u0627\u0641\u062D\u0635 \u0645\u0627 \u0625\u0630\u0627 \u0643\u0627\u0646 \u0627\u0644\u0645\u062A\u0635\u0641\u062D \u0627\u0644\u062E\u0627\u0635 \u0628\u0643 \u062A\u0645 \u0625\u0639\u062F\u0627\u062F\u0647 \u0628\u0634\u0643\u0644 \u0635\u062D\u064A\u062D.
topnav.close=\u0625\u063A\u0644\u0627\u0642 \u0627\u0644\u0646\u0627\u0641\u0630\u0629
topnav.close.alt=\u0625\u063A\u0644\u0627\u0642 \u0647\u0630\u0647 \u0627\u0644\u0646\u0627\u0641\u0630\u0629
topnav.help=\u0645\u0633\u0627\u0639\u062F\u0629
diff --git a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_bg.properties b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_bg.properties
index f304ff40ca1..0e5e5752e3b 100644
--- a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_bg.properties
+++ b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_bg.properties
@@ -1,9 +1,11 @@
-#Tue Jul 14 18:33:54 CEST 2009
+#Wed Nov 04 23:14:08 CET 2015
command.closeprinting=\u0417\u0430\u0442\u0432\u043E\u0440\u0435\u0442\u0435 \u043F\u0440\u0435\u0433\u043B\u0435\u0434\u0430 \u0437\u0430 \u043F\u0440\u0438\u043D\u0442\u0438\u0440\u0430\u043D\u0435
footer.ajax.hover=\u0420\u0435\u0436\u0438\u043C\u044A\u0442 AJAX \u0435 \u0430\u043A\u0442\u0438\u0432\u0435\u043D, \u043A\u043E\u0435\u0442\u043E \u043E\u0437\u043D\u0430\u0447\u0430\u0432\u0430 \u043F\u043E-\u0431\u044A\u0440\u0437\u0430 \u0440\u0430\u0431\u043E\u0442\u0430 \u043D\u0430 \u0441\u0438\u0441\u0442\u0435\u043C\u0430\u0442\u0430.
footer.login=\u0412\u043B\u0438\u0437\u0430\u043D\u0435 \u0432 \u0441\u0438\u0441\u0442\u0435\u043C\u0430\u0442\u0430
not.logged.in=\u041D\u0435 \u0441\u0442\u0435 \u0432\u043B\u0435\u0437\u043B\u0438 \u0432 \u0441\u0438\u0441\u0442\u0435\u043C\u0430\u0442\u0430
other.users.online=\u043F\u043E\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043B\u0438 \u0441\u0430 \u043E\u043D\u043B\u0430\u0439\u043D
+topnav.check=\u041F\u0440\u043E\u0432\u0435\u0440\u043A\u0430 \u043D\u0430 \u0431\u0440\u0430\u0443\u0437\u044A\u0440
+topnav.check.alt=\u041F\u0440\u043E\u0432\u0435\u0440\u0435\u0442\u0435 \u0434\u0430\u043B\u0438 \u0432\u0430\u0448\u0438\u044F\u0442 \u0431\u0440\u0430\u0443\u0437\u044A\u0440 \u0435 \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u0430\u043D \u043F\u0440\u0430\u0432\u0438\u043B\u043D\u043E
topnav.close=\u0417\u0430\u0442\u0432\u043E\u0440\u0435\u0442\u0435 \u043F\u0440\u043E\u0437\u043E\u0440\u0435\u0446
topnav.close.alt=\u0417\u0430\u0442\u0432\u043E\u0440\u0435\u0442\u0435 \u0442\u043E\u0437\u0438 \u043F\u0440\u043E\u0437\u043E\u0440\u0435\u0446
topnav.help=\u041F\u043E\u043C\u043E\u0449
diff --git a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_cs.properties b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_cs.properties
index 45ce6cd86ca..c0b26d3b3ff 100644
--- a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_cs.properties
+++ b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_cs.properties
@@ -1,9 +1,11 @@
-#Mon Mar 02 09:54:14 CET 2009
+#Wed Nov 04 23:14:08 CET 2015
command.closeprinting=Zav\u0159\u00EDt tiskov\u00FD n\u00E1hled
footer.ajax.hover=AJAX m\u00F3d je aktivn\u00ED, OLAT b\u011B\u017E\u00ED rychleji.
footer.login=Login
not.logged.in=Nep\u0159ihl\u00E1\u0161en
other.users.online=u\u017Eivatel\u016F OLATu online
+topnav.check=Zkou\u0161ka prohl\u00ED\u017Ee\u010De
+topnav.check.alt=Zkontroluje, zda je prohl\u00ED\u017Ee\u010D spr\u00E1vn\u011B nastaven
topnav.close=Zav\u0159\u00EDt okno
topnav.close.alt=Zav\u0159\u00EDt toto okno
topnav.help=N\u00E1pov\u011Bda
diff --git a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_da.properties b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_da.properties
index 3af0eca4803..cb3554feff5 100644
--- a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_da.properties
+++ b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_da.properties
@@ -1,8 +1,10 @@
-#Mon Mar 02 09:54:09 CET 2009
+#Wed Nov 04 23:14:08 CET 2015
command.closeprinting=Luk udskriftsvisning
footer.login=Login
not.logged.in=Ikke logget ind
other.users.online=Andre brugere er online
+topnav.check=Browser-tjek
+topnav.check.alt=Tjek, om din browser er korrekt indstillet
topnav.close=Luk vinduet
topnav.close.alt=Luk dette vindue
topnav.help=Hj\u00E6lp
diff --git a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_de.properties
index 31de45874da..b5042872160 100644
--- a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_de.properties
@@ -1,30 +1,31 @@
-#Mon Mar 02 09:54:04 CET 2009
+#Wed Nov 04 23:14:08 CET 2015
+chelp.about.title=$org.olat.login\:chelp.about.title
command.closeprinting=Druckansicht schliessen
footer.ajax.hover=AJAX-Modus ist eingeschaltet\: Damit sind Sie schnell in OLAT unterwegs.
footer.login=Login
-not.logged.in=Nicht eingeloggt
logged.in.invitee=Eingeloggt als <i>Eingeladene</i>
+not.logged.in=Nicht eingeloggt
other.users.online=Personen sind online
+topnav.check=Browsercheck
+topnav.check.alt=Pr\u00FCfen Sie, ob Ihr Browser korrekt konfiguriert ist
topnav.close=Fenster schliessen
topnav.close.alt=Schliessen Sie dieses Fenster
topnav.help=Hilfe
topnav.help.alt=Starten Sie die OLAT-Hilfe
topnav.impressum=Impressum
topnav.impressum.alt=Impressum
-topnav.permlink=Eindeutiger Link (Permalink)
-topnav.permlink.info=hierher verlinken mittels {0}
topnav.login=Login
topnav.login.alt=Loggen Sie sich in OLAT ein
topnav.logout=Log out
topnav.logout.alt=Loggen Sie sich aus OLAT aus
+topnav.my.menu.configurations=Konfiguration
+topnav.my.menu.label={0}
+topnav.my.menu.systems=System
+topnav.my.menu.tools=Pers\u00F6nliche Werkzeuge
+topnav.permlink=Eindeutiger Link (Permalink)
+topnav.permlink.info=hierher verlinken mittels {0}
topnav.printview=Drucken
topnav.printview.alt=Diese Seite drucken
topnav.search=Suche
topnav.search.alt=Suchen Sie innerhalb von OLAT
username=Eingeloggt als <i>{0}</i>
-topnav.my.menu.label={0}
-topnav.my.menu.tools=Persönliche Werkzeuge
-topnav.my.menu.configurations=Konfiguration
-topnav.my.menu.systems=System
-chelp.about.title=$org.olat.login\:chelp.about.title
-
diff --git a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_el.properties b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_el.properties
index 00dfb463e98..cb6042d94f6 100644
--- a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_el.properties
+++ b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_el.properties
@@ -1,9 +1,11 @@
-#Sat Mar 13 14:19:18 CET 2010
+#Wed Nov 04 23:14:08 CET 2015
command.closeprinting=\u039A\u03BB\u03B5\u03AF\u03C3\u03B9\u03BC\u03BF \u03C0\u03C1\u03BF\u03B2\u03BF\u03BB\u03AE\u03C2 \u03B5\u03BA\u03C4\u03CD\u03C0\u03C9\u03C3\u03B7\u03C2
footer.ajax.hover=\u0397 \u03BB\u03B5\u03B9\u03C4\u03BF\u03C5\u03C1\u03B3\u03AF\u03B1 AJAX \u03B5\u03AF\u03BD\u03B1\u03B9 \u03B5\u03BD\u03B5\u03C1\u03B3\u03AE, \u03C4\u03BF \u03BF\u03C0\u03BF\u03AF\u03BF \u03C3\u03B7\u03BC\u03B1\u03AF\u03BD\u03B5\u03B9 \u03C4\u03B1\u03C7\u03CD\u03C4\u03B5\u03C1\u03B7 \u03B4\u03C1\u03AC\u03C3\u03B7 \u03C3\u03C4\u03BF OLAT.
footer.login=\u0395\u03AF\u03C3\u03BF\u03B4\u03BF\u03C2
not.logged.in=\u0391\u03C0\u03BF\u03C3\u03C5\u03BD\u03B4\u03B5\u03B4\u03B5\u03BC\u03AD\u03BD\u03BF\u03C2/\u03B7
other.users.online=\u03A3\u03C5\u03BD\u03B4\u03B5\u03B4\u03B5\u03BC\u03AD\u03BD\u03BF\u03B9 \u03C7\u03C1\u03AE\u03C3\u03C4\u03B5\u03C2 OLAT
+topnav.check=\u0388\u03BB\u03B5\u03B3\u03C7\u03BF\u03C2 \u03C6\u03C5\u03BB\u03BB\u03BF\u03BC\u03B5\u03C4\u03C1\u03B7\u03C4\u03AE (browser)
+topnav.check.alt=\u0395\u03BB\u03AD\u03B3\u03BE\u03C4\u03B5 \u03B5\u03AC\u03BD \u03BF browser \u03B5\u03AF\u03BD\u03B1\u03B9 \u03C3\u03C9\u03C3\u03C4\u03AC \u03C1\u03C5\u03B8\u03BC\u03B9\u03C3\u03BC\u03AD\u03BD\u03BF\u03C2
topnav.close=\u039A\u03BB\u03B5\u03AF\u03C3\u03B9\u03BC\u03BF \u03C0\u03B1\u03C1\u03B1\u03B8\u03CD\u03C1\u03BF\u03C5
topnav.close.alt=\u039A\u03BB\u03B5\u03AF\u03C3\u03B9\u03BC\u03BF \u03C4\u03BF\u03C5 \u03C4\u03C1\u03AD\u03C7\u03BF\u03BD\u03C4\u03BF\u03C2 \u03C0\u03B1\u03C1\u03B1\u03B8\u03CD\u03C1\u03BF\u03C5
topnav.help=\u0392\u03BF\u03AE\u03B8\u03B5\u03B9\u03B1
diff --git a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_en.properties
index 215461c339c..b210b7982be 100644
--- a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_en.properties
@@ -1,4 +1,4 @@
-#Tue Dec 16 08:59:20 CET 2014
+#Wed Nov 04 23:14:08 CET 2015
chelp.about.title=$org.olat.login\:chelp.about.title
command.closeprinting=Close print view
footer.ajax.hover=AJAX mode is active--which means faster action in OLAT.
@@ -6,6 +6,8 @@ footer.login=Login
logged.in.invitee=Logged in as <i>invitee</i>
not.logged.in=Not logged in
other.users.online=People are online
+topnav.check=Browser check
+topnav.check.alt=Check if your browser is properly configured
topnav.close=Close window
topnav.close.alt=Close this window
topnav.help=Help
diff --git a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_es.properties b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_es.properties
index 692db855324..4a6e722c530 100644
--- a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_es.properties
+++ b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_es.properties
@@ -1,9 +1,11 @@
-#Fri Sep 18 23:58:06 CEST 2009
+#Wed Nov 04 23:14:08 CET 2015
command.closeprinting=Cerrar vista de impresi\u00F3n
footer.ajax.hover=Modo AJAX activo (OLAT entonces es mas rapido).
footer.login=Conectar
not.logged.in=no conectado
other.users.online=usuarios de OLAT conectados
+topnav.check=Comprobaci\u00F3n de navegador
+topnav.check.alt=Comprueba si tu navegador est\u00E1 correctamente configurado
topnav.close=Cerrar ventana
topnav.close.alt=Cierra esta ventana
topnav.help=Ayuda
diff --git a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_fa.properties b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_fa.properties
index 6fbddec1ab0..69305f098f9 100644
--- a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_fa.properties
+++ b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_fa.properties
@@ -1,7 +1,9 @@
-#Mon Mar 02 09:54:13 CET 2009
+#Wed Nov 04 23:14:08 CET 2015
command.closeprinting=\u0628\u0633\u062A\u0646 \u067E\u0646\u062C\u0631\u0647 \u067E\u06CC\u0634 \u0646\u0645\u0627\u06CC\u0634 \u0686\u0627\u067E\u06AF\u0631
not.logged.in=\u0647\u0646\u0648\u0632 \u0648\u0631\u0648\u062F \u0635\u0648\u0631\u062A \u0646\u06AF\u0631\u0641\u062A\u0647 \u0627\u0633\u062A
other.users.online=\u06A9\u0627\u0631\u0628\u0631\u0627\u0646 \u062D\u0627\u0636\u0631
+topnav.check=\u0628\u0631\u0631\u0633\u06CC \u0645\u0631\u0648\u0631\u06AF\u0631 \u0648\u0628
+topnav.check.alt=\u0628\u0631\u0631\u0633\u06CC \u062F\u0631\u0633\u062A\u06CC \u067E\u06CC\u06A9\u0631 \u0628\u0646\u062F\u06CC \u0645\u0631\u0648\u0631 \u06AF\u0631 \u0634\u0645\u0627
topnav.close=\u0628\u0633\u062A\u0646 \u067E\u0646\u062C\u0631\u0647
topnav.close.alt=Close this window
topnav.help=\u0631\u0627\u0647\u0646\u0645\u0627
diff --git a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_fr.properties
index d02b634e1a4..e5884dc0262 100644
--- a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_fr.properties
@@ -1,4 +1,4 @@
-#Mon Dec 08 08:34:45 CET 2014
+#Wed Nov 04 23:14:08 CET 2015
chelp.about.title=$org.olat.login\:chelp.about.title
command.closeprinting=Fermer aper\u00E7u avant impression
footer.ajax.hover=Le mode AJAX est activ\u00E9\: ainsi, vous vous d\u00E9placez plus vite dans OLAT.
@@ -6,6 +6,8 @@ footer.login=Login
logged.in.invitee=Enregistr\u00E9-e comme <i>invit\u00E9-e</i>
not.logged.in=Pas connect\u00E9
other.users.online=personnes sont en ligne
+topnav.check=Contr\u00F4le du navigateur
+topnav.check.alt=Assurez-vous que votre navigateur est configur\u00E9 correctement
topnav.close=Fermer fen\u00EAtre
topnav.close.alt=Fermez cette fen\u00EAtre
topnav.help=Aide
diff --git a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_it.properties
index 40a4d6e3459..dd9c353b04b 100644
--- a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_it.properties
+++ b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_it.properties
@@ -1,9 +1,11 @@
-#Fri Sep 03 13:31:08 CEST 2010
+#Wed Nov 04 23:14:08 CET 2015
command.closeprinting=Chiudere anteprima stampa
footer.ajax.hover=La modalit\u00E0 AJAX \u00E8 attivata\: in questo modo si pu\u00F2 muovere pi\u00F9 velocemente in OLAT.
footer.login=Login
not.logged.in=Non connesso
other.users.online=persone sono online
+topnav.check=Verifica del browser
+topnav.check.alt=Si informi sulla corretta configurazione del Suo browser.
topnav.close=Chiudere finestra
topnav.close.alt=Chiuda questa finestra
topnav.help=Aiuto
diff --git a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_jp.properties b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_jp.properties
index 1feb28aced4..ef5b42d1355 100644
--- a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_jp.properties
+++ b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_jp.properties
@@ -1,9 +1,10 @@
-#Sat May 22 20:31:28 CEST 2010
+#Wed Nov 04 23:14:08 CET 2015
command.closeprinting=\u30D7\u30EA\u30F3\u30C8\u30D3\u30E5\u30FC\u3092\u9589\u3058\u308B
footer.ajax.hover=AJAX\u30E2\u30FC\u30C9\u304C\u6709\u52B9\u306B\u3055\u308C\u3066\u3044\u307E\u3059 - OLAT\u3092\u7D20\u65E9\u304F\u64CD\u4F5C\u3067\u304D\u308B\u3053\u3068\u3092\u610F\u5473\u3057\u307E\u3059\u3002
footer.login=\u30ED\u30B0\u30A4\u30F3
not.logged.in=\u30ED\u30B0\u30A4\u30F3\u3057\u3066\u3044\u307E\u305B\u3093\u3002
other.users.online=\u30E6\u30FC\u30B6\u306F\u30AA\u30F3\u30E9\u30A4\u30F3\u3067\u3059\u3002
+topnav.check=\u30D6\u30E9\u30A6\u30B6\u30C1\u30A7\u30C3\u30AF
topnav.close=\u30A6\u30A3\u30F3\u30C9\u30A6\u3092\u9589\u3058\u308B
topnav.close.alt=\u3053\u306E\u30A6\u30A3\u30F3\u30C9\u30A6\u3092\u9589\u3058\u308B
topnav.help=\u30D8\u30EB\u30D7
diff --git a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_lt.properties b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_lt.properties
index 7ec6ae58e38..e15dc039f1d 100644
--- a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_lt.properties
+++ b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_lt.properties
@@ -1,9 +1,11 @@
-#Mon Mar 02 09:54:02 CET 2009
+#Wed Nov 04 23:14:08 CET 2015
command.closeprinting=U\u017Edaryti per\u017Ei\u016Br\u0105
footer.ajax.hover=AJAX re\u017Eimas aktyvus - tai reik\u0161ia OLAT greitesni veiksmai.
footer.login=Prisijungimas
not.logged.in=Nesate prisijung\u0119
other.users.online=dirba \u0161iuo metu
+topnav.check=Nar\u0161ykl\u0117s patikrinimas
+topnav.check.alt=Patikrinkite ar j\u016Bs\u0173 nar\u0161ykl\u0117 tinkamai nustatyta
topnav.close=U\u017Edaryti lang\u0105
topnav.close.alt=U\u017Edaryti \u0161\u012F lang\u0105
topnav.help=Pagalba
diff --git a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_nl_NL.properties b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_nl_NL.properties
index 3ae6d893205..698fcd82006 100644
--- a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_nl_NL.properties
+++ b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_nl_NL.properties
@@ -1,9 +1,11 @@
-#Mon Feb 01 13:28:31 CET 2010
+#Wed Nov 04 23:14:08 CET 2015
command.closeprinting=Afdrukvoorbeeld sluiten
footer.ajax.hover=AJAX mode staat aan--dat betekend snellere werking van de OLAT gebruikersinterface.
footer.login=Aanmelden
not.logged.in=Niet aangemeld
other.users.online=Mensen zijn online
+topnav.check=Browser check
+topnav.check.alt=Kijk na of uw browser op de correcte manier geconfigureerd is
topnav.close=Venster sluiten
topnav.close.alt=Sluit dit venster
topnav.help=help
diff --git a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_pl.properties b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_pl.properties
index 291561b28a8..cda2b652c64 100644
--- a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_pl.properties
+++ b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_pl.properties
@@ -1,10 +1,12 @@
-#Thu Aug 28 10:26:47 CEST 2014
+#Wed Nov 04 23:14:08 CET 2015
command.closeprinting=Zamknij podgl\u0105d wydruku
footer.ajax.hover=Tryb AJAX jest uaktywniony, co oznacza, \u017Ce OLAT pracuje teraz szybciej.
footer.login=Loguj
logged.in.invitee=Zalogowany jako <i>go\u015B\u0107</i>
not.logged.in=Niezalogowany
other.users.online=u\u017Cytkownik\u00F3w OLAT jest on-line
+topnav.check=Informacje o przegl\u0105darce
+topnav.check.alt=Sprawd\u017A czy twoja przegl\u0105darka jest odpowiednio skonfigurowana
topnav.close=Zamknij okno
topnav.close.alt=Zamknij to okno
topnav.help=Pomoc
diff --git a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_pt_BR.properties
index e211a7eaf41..f70145a8bd6 100644
--- a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_pt_BR.properties
@@ -1,4 +1,4 @@
-#Fri Jan 23 22:14:18 CET 2015
+#Wed Nov 04 23:14:08 CET 2015
chelp.about.title=$org.olat.login\:chelp.about.title
command.closeprinting=Fechar visualiza\u00E7\u00E3o de impress\u00E3o
footer.ajax.hover=Modo AJAX est\u00E1 ativo, o que significa respostas r\u00E1pidas no OLAT.
@@ -6,6 +6,8 @@ footer.login=Entrar
logged.in.invitee=Logado como <i>convidado</i>
not.logged.in=N\u00E3o entrou
other.users.online=Usu\u00E1rios do OLAT est\u00E3o online
+topnav.check=Verifica\u00E7\u00E3o do Browser
+topnav.check.alt=Verificar se seu browser est\u00E1 configurado corretamente
topnav.close=Fechar janela
topnav.close.alt=Fechar esta janela
topnav.help=Ajuda
diff --git a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_pt_PT.properties b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_pt_PT.properties
index 32fde4cd9ae..a9636750924 100644
--- a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_pt_PT.properties
+++ b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_pt_PT.properties
@@ -1,9 +1,11 @@
-#Mon Mar 02 09:54:05 CET 2009
+#Wed Nov 04 23:14:08 CET 2015
command.closeprinting=Fechar visualiza\u00E7\u00E3o de impress\u00E3o
footer.ajax.hover=Modo AJAX est\u00E1 ativo, o que significa respostas r\u00E1pidas no OLAT.
footer.login=Entrar
not.logged.in=N\u00E3o entrou
other.users.online=Usu\u00E1rios do OLAT est\u00E3o online
+topnav.check=Verifica\u00E7\u00E3o do Browser
+topnav.check.alt=Verificar se seu browser est\u00E1 configurado corretamente
topnav.close=Fechar janela
topnav.close.alt=Fechar esta janela
topnav.help=Ajuda
diff --git a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_ru.properties b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_ru.properties
index 435f6214825..cb4c168fc17 100644
--- a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_ru.properties
+++ b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_ru.properties
@@ -1,9 +1,11 @@
-#Mon Jul 27 16:43:09 CEST 2009
+#Wed Nov 04 23:14:08 CET 2015
command.closeprinting=\u0417\u0430\u043A\u0440\u044B\u0442\u044C \u0432\u044B\u0432\u043E\u0434 \u043D\u0430 \u043F\u0435\u0447\u0430\u0442\u044C
footer.ajax.hover=AJAX \u043C\u043E\u0434\u0443\u0441 \u0430\u043A\u0442\u0438\u0432\u0438\u0440\u043E\u0432\u0430\u043D -- \u044D\u0442\u043E \u043E\u0437\u043D\u0430\u0447\u0430\u0435\u0442 \u0431\u044B\u0441\u0442\u0440\u043E\u0435 \u043F\u0435\u0440\u0435\u043C\u0435\u0449\u0435\u043D\u0438\u0435 \u043F\u043E OLAT.
footer.login=\u0412\u0445\u043E\u0434
not.logged.in=\u0412\u043D\u0435 \u0441\u0438\u0441\u0442\u0435\u043C\u044B
other.users.online=\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F(\u0435\u0439) OLAT \u0432 \u0441\u0435\u0442\u0438
+topnav.check=\u041F\u0440\u043E\u0432\u0435\u0440\u043A\u0430 \u0431\u0440\u0430\u0443\u0437\u0435\u0440\u0430
+topnav.check.alt=\u041F\u0440\u043E\u0432\u0435\u0440\u044C\u0442\u0435, \u043F\u0440\u0430\u0432\u0438\u043B\u044C\u043D\u043E \u043B\u0438 \u043D\u0430\u0441\u0442\u0440\u043E\u0435\u043D \u0412\u0430\u0448 \u0431\u0440\u0430\u0443\u0437\u0435\u0440
topnav.close=\u0417\u0430\u043A\u0440\u044B\u0442\u044C \u043E\u043A\u043D\u043E
topnav.close.alt=\u0417\u0430\u043A\u0440\u044B\u0442\u044C \u044D\u0442\u043E \u043E\u043A\u043D\u043E
topnav.help=\u041F\u043E\u043C\u043E\u0449\u044C
diff --git a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_sq.properties b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_sq.properties
index a3d896e4714..fe655cff2a9 100644
--- a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_sq.properties
+++ b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_sq.properties
@@ -1,9 +1,11 @@
-#Mon Mar 02 09:54:11 CET 2009
+#Wed Nov 04 23:14:08 CET 2015
command.closeprinting=Mbylle pamjen e shtypjes
footer.ajax.hover=M\u00EBnyra AJAX \u00EBsht\u00EB aktive, q\u00EB do t\u00EB thot\u00EB aksione m\u00EB t\u00EB shpejta n\u00EB OLAT.
footer.login=Ky\u00E7u
not.logged.in=Jo t\u00EB ky\u00E7ur
other.users.online=OLAT shfryt\u00EBzuesit n\u00EB linj\u00EB
+topnav.check=Kontrollo shfletuesin
+topnav.check.alt=Kontrollo n\u00EBse shfletuesi i juaj \u00EBsht\u00EB i konfiguruar si duhet
topnav.close=Mbylle dritaren
topnav.close.alt=Mbylle k\u00EBt\u00EB dritare
topnav.help=Ndihma
diff --git a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_zh_CN.properties
index ac44ddb8512..31d51d93654 100644
--- a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_zh_CN.properties
@@ -1,9 +1,11 @@
-#Mon Sep 22 09:41:14 CEST 2014
+#Wed Nov 04 23:14:08 CET 2015
command.closeprinting=\u5173\u95ED\u6253\u5370\u9884\u89C8
footer.ajax.hover=AJAX\u6A21\u5F0F\u5DF2\u5F00\u542F--OLAT\u52A0\u901F\u5668
footer.login=\u767B\u5165
not.logged.in=\u672A\u767B\u5F55
other.users.online=OpenOLAT\u7528\u6237\u5728\u7EBF
+topnav.check=\u6D4F\u89C8\u5668\u68C0\u6D4B
+topnav.check.alt=\u68C0\u6D4B\u4F60\u7684\u6D4F\u89C8\u5668\u914D\u7F6E\u60C5\u51B5
topnav.close=\u5173\u95ED\u7A97\u53E3
topnav.close.alt=\u5173\u95ED\u8BE5\u7A97\u53E3
topnav.help=\u5E2E\u52A9
diff --git a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_zh_TW.properties b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_zh_TW.properties
index 88e8b0f9c5a..c327a218345 100644
--- a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_zh_TW.properties
+++ b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_zh_TW.properties
@@ -1,9 +1,11 @@
-#Sat Aug 01 07:08:19 CEST 2009
+#Wed Nov 04 23:14:08 CET 2015
command.closeprinting=\u95DC\u9589\u5217\u5370\u8996\u7A97
footer.ajax.hover=AJAX \u6A21\u5F0F\u5DF2\u555F\u7528--\u8868\u793A\u5728 OLAT \u4E2D\u6703\u6709\u8F03\u5FEB\u7684\u52D5\u4F5C\u3002
footer.login=\u767B\u5165
not.logged.in=\u5C1A\u672A\u767B\u5165
other.users.online=OLAT \u4F7F\u7528\u8005\u4E0A\u7DDA
+topnav.check=\u700F\u89BD\u5668\u6AA2\u67E5
+topnav.check.alt=\u6AA2\u67E5\u60A8\u7684\u700F\u89BD\u5668\u662F\u5426\u5DF2\u6B63\u78BA\u5730\u8A2D\u5B9A\u4E86
topnav.close=\u95DC\u9589\u8996\u7A97
topnav.close.alt=\u95DC\u9589\u9019\u500B\u8996\u7A97
topnav.help=\u8AAA\u660E
diff --git a/src/main/java/org/olat/ims/cp/ui/CPContentController.java b/src/main/java/org/olat/ims/cp/ui/CPContentController.java
index 47bf5b05110..f71f6676748 100644
--- a/src/main/java/org/olat/ims/cp/ui/CPContentController.java
+++ b/src/main/java/org/olat/ims/cp/ui/CPContentController.java
@@ -26,10 +26,11 @@
package org.olat.ims.cp.ui;
-import org.olat.core.commons.contextHelp.ContextHelpComponent;
import org.olat.core.commons.editor.htmleditor.HTMLEditorController;
import org.olat.core.commons.editor.htmleditor.WysiwygFactory;
import org.olat.core.commons.fullWebApp.LayoutMain3ColsPreviewController;
+import org.olat.core.commons.services.help.HelpLinkSPI;
+import org.olat.core.commons.services.help.HelpModule;
import org.olat.core.gui.UserRequest;
import org.olat.core.gui.components.Component;
import org.olat.core.gui.components.link.Link;
@@ -54,6 +55,7 @@ import org.olat.ims.cp.CPManager;
import org.olat.ims.cp.CPManagerImpl;
import org.olat.ims.cp.ContentPackage;
import org.olat.modules.cp.CPUIFactory;
+import org.springframework.beans.factory.annotation.Autowired;
public class CPContentController extends BasicController {
@@ -66,8 +68,12 @@ public class CPContentController extends BasicController {
private CloseableModalController dialogCtr;
private LayoutMain3ColsPreviewController previewCtr;
private Link editMetadataLink, previewLink;
+ private Component helpLink;
private DeliveryOptions deliveryOptions;
private StackedPanel mainPanel;
+
+ @Autowired
+ private HelpModule helpModule;
protected CPContentController(UserRequest ureq, WindowControl control, ContentPackage cp) {
super(ureq, control);
@@ -78,6 +84,12 @@ public class CPContentController extends BasicController {
if(packageConfig != null) {
deliveryOptions = packageConfig.getDeliveryOptions();
}
+
+ // init help link, can't do this in initToolbar because ureq is missing
+ if (helpModule.isHelpEnabled()) {
+ HelpLinkSPI provider = helpModule.getHelpProvider();
+ helpLink = provider.getHelpPageLink(ureq, translate("help"), translate("help.hover"), "o_icon o_icon-lg o_icon_help", null, "CP Editor");
+ }
// set initial page to display
iframeCtr = new IFrameDisplayController(ureq, control, cp.getRootDir());
@@ -105,8 +117,9 @@ public class CPContentController extends BasicController {
previewLink.setTooltip(translate("contentcontroller.previewlink_title"));
toolbar.addTool(previewLink, Align.right);
- ContextHelpComponent contextHelp = new ContextHelpComponent("cpHelp", getLocale());
- toolbar.addTool(contextHelp, Align.right);
+ if (helpLink != null) {
+ toolbar.addTool(helpLink, Align.right);
+ }
}
/**
diff --git a/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_ar.properties b/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_ar.properties
index c79e22c51b5..14bf5489a5c 100644
--- a/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_ar.properties
+++ b/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_ar.properties
@@ -1,4 +1,4 @@
-#Sun Feb 14 14:55:30 CET 2010
+#Wed Nov 04 16:51:49 CET 2015
FileResource.IMSCP=\u0645\u062D\u062A\u0648\u0649 \u062D\u0632\u0645\u0629 \u0627\u0644\u062A\u0639\u0644\u064A\u0645
chelp.cpeditorhelp.add=\u062D\u062F\u062F \u0627\u0644\u0635\u0641\u062D\u0629 \u0627\u0644\u062A\u064A \u062A\u0631\u064A\u062F \u0625\u0636\u0627\u0641\u062A\u0647\u0627 \u0643\u0635\u0641\u062D\u0629 \u0641\u0631\u0639\u064A\u0629 \u0642\u0628\u0644 \u0627\u0644\u0646\u0642\u0631 \u0639\u0644\u0649 \u0632\u0631 "\u0625\u0636\u0627\u0641\u0629 \u0635\u0641\u062D\u0629"\u060C \u0648\u0633\u062A\u0636\u0627\u0641 \u0627\u0644\u0635\u0641\u062D\u0629 \u0627\u0644\u0641\u0631\u0639\u064A\u0629 \u0623\u0633\u0641\u0644 \u0627\u0644\u0635\u0641\u062D\u0629 \u0627\u0644\u0645\u062E\u062A\u0627\u0631\u0629\u060C \u0648\u0644\u0643\u0646 \u0628\u0625\u0645\u0643\u0627\u0646\u0643 \u062A\u062D\u0631\u064A\u0643 \u0647\u0630\u0647 \u0627\u0644\u0635\u0641\u062D\u0629 \u0627\u0644\u0641\u0631\u0639\u064A\u0629 \u0641\u064A\u0645\u0627 \u0628\u0639\u062F.
chelp.cpeditorhelp.add.title=\u0625\u0636\u0627\u0641\u0629 \u0635\u0641\u062D\u0629
@@ -8,7 +8,6 @@ chelp.cpeditorhelp.delete=\u0644\u062D\u0630\u0641 \u0635\u0641\u062D\u0629 \u06
chelp.cpeditorhelp.delete.title=\u062D\u0630\u0641 \u0635\u0641\u062D\u0629
chelp.cpeditorhelp.edit=\u062D\u062F\u062F \u0627\u0644\u0635\u0641\u062D\u0629 \u0627\u0644\u062A\u0649 \u062A\u0631\u064A\u062F \u062A\u0639\u062F\u064A\u0644\u0647\u0627\u060C \u0648\u0633\u064A\u062A\u0645 \u0639\u0631\u0636 \u0645\u062D\u062A\u0648\u0627\u0647\u0627 \u0641\u0649 \u0627\u0644\u0645\u062D\u0631\u0631 \u062D\u062A\u0649 \u062A\u0633\u062A\u0637\u064A\u0639 \u0625\u062C\u0631\u0627\u0621 \u0623\u064A\u0629 \u062A\u0639\u062F\u064A\u0644\u0627\u062A \u0636\u0631\u0648\u0631\u064A\u0629\u060C \u0648\u064A\u0645\u0643\u0646 \u0623\u064A\u0636\u0627 \u0639\u0645\u0644 \u0627\u0644\u062A\u0646\u0633\u064A\u0642 \u0628\u0648\u0627\u0633\u0637\u0629 \u0627\u0644\u0623\u0632\u0631\u0627\u0631\u060C \u0641\u0642\u0637 \u0642\u0645 \u0628\u0627\u0644\u0636\u063A\u0637 \u0639\u0644\u0649 \u0632\u0631 "\u062D\u0641\u0638" \u0641\u0649 \u0623\u0633\u0641\u0644 \u0627\u0644\u0645\u062D\u0631\u0631 \u0644\u062A\u0637\u0628\u064A\u0642 \u0647\u0630\u0647 \u0627\u0644\u062A\u063A\u064A\u064A\u0631\u0627\u062A
chelp.cpeditorhelp.edit.title=\u062A\u0639\u062F\u064A\u0644 \u0645\u062D\u062A\u0648\u0649 \u0627\u0644\u0635\u0641\u062D\u0629
-chelp.cpeditorhelp.hover=\u0645\u0633\u0627\u0639\u062F\u0629 \u0628\u0634\u0623\u0646 \u0645\u062D\u0631\u0631 \u062D\u0632\u0645\u0629 \u0627\u0644\u0645\u062D\u062A\u0648\u0649\r\nIMS
chelp.cpeditorhelp.import=\u0647\u0630\u0647 \u0627\u0644\u062E\u0627\u0635\u064A\u0629 \u062A\u0633\u0645\u062D \u0644\u0643 \u0628\u062A\u062D\u0645\u064A\u0644 \u0627\u0644\u0645\u0644\u0641\u0627\u062A \u0645\u062B\u0644 \u0627\u0644\u0635\u0648\u0631 \u0648\u0627\u0644\u0641\u064A\u062F\u064A\u0648 \u0648\u0635\u0641\u062D\u0627\u062A \u0623\u062A\u0634 \u062A\u064A \u0623\u0645 \u0623\u0644 \u0625\u0644\u0649 \u0627\u0644\u0645\u062D\u0631\u0631 \u0642\u0628\u0644 \u062F\u0645\u062C \u062A\u0644\u0643 \u0627\u0644\u0635\u0641\u062D\u0627\u062A \u0627\u0644\u062C\u062F\u064A\u062F\u0629 \u0641\u0649 \u0627\u0644\u0647\u064A\u0643\u0644 \u0627\u0644\u0641\u0639\u0644\u0649 \u0627\u0644\u0645\u0648\u062C\u0648\u062F\u060C \u0648\u0625\u0630\u0627 \u0643\u0646\u062A \u062A\u0631\u064A\u062F \u0627\u062F\u062E\u0627\u0644 \u0639\u062F\u0629 \u0645\u0644\u0641\u0627\u062A \u0645\u0631\u0629 \u0648\u0627\u062D\u062F\u0629 \u0641\u064A\u062C\u0628 \u0623\u0648\u0644\u0627\u064B \u062A\u062D\u0648\u064A\u0644\u0647\u0645 \u0625\u0644\u0649 \u0645\u0644\u0641 \u0645\u0636\u063A\u0648\u0637 \u0648\u0630\u0644\u0643 \u0642\u0628\u0644 \u0625\u0636\u0627\u0641\u0629 \u0627\u0644\u0645\u0644\u0641 \u0627\u0644\u0645\u0636\u063A\u0648\u0637 \u0627\u0644\u062C\u062F\u064A\u062F \u0639\u0644\u0649 \u0634\u0643\u0644 \u0635\u0641\u062D\u0629 \u062C\u062F\u064A\u062F\u0629\u060C \u0627\u0644\u0647\u064A\u0643\u0644 \u062F\u0627\u062E\u0644 \u0627\u0644\u0645\u0644\u0641 \u0627\u0644\u0645\u0636\u063A\u0648\u0637 \u0633\u064A\u062A\u0645 \u0625\u062F\u0631\u0627\u062C\u0647 \u0641\u064A \u0627\u0644\u0642\u0627\u0626\u0645\u0629\u060C \u0627\u0646\u0642\u0631 \u0639\u0644\u0649 \u0632\u0631 "\u0627\u0633\u062A\u064A\u0631\u0627\u062F \u0635\u0641\u062D\u0629" \u0641\u064A \u0634\u0631\u064A\u0637 \u0627\u0644\u0639\u0646\u0648\u0627\u0646\u060C \u0648\u0633\u064A\u062A\u0645 \u0641\u062A\u062D \u0646\u0627\u0641\u0630\u0629 \u064A\u0645\u0643\u0646\u0643 \u0645\u0646 \u062E\u0644\u0627\u0644\u0647\u0627 \u064A\u0645\u0643\u0646\u0643 \u0627\u062E\u062A\u064A\u0627\u0631 \u0627\u0644\u0645\u0644\u0641 \u0627\u0644\u0645\u0646\u0627\u0633\u0628.
chelp.cpeditorhelp.import.title=\u0627\u0633\u062A\u064A\u0631\u0627\u062F \u0645\u062D\u062A\u0648\u0649
chelp.cpeditorhelp.intro=\u062A\u062A\u064A\u062D \u0644\u0643 \u0647\u0630\u0647 \u0627\u0644\u0623\u062F\u0627\u0629 \u0633\u0647\u0648\u0644\u0629 \u0625\u0646\u0634\u0627\u0621 \u0648\u062A\u0639\u062F\u064A\u0644 \u0627\u0644\u0645\u062D\u062A\u0648\u0649 \u0627\u0644\u062A\u0639\u0644\u064A\u0645\u0649 \u0645\u0639 \u0627\u0644\u0645\u062D\u0631\u0631\u060C \u0643\u0645\u0627 \u064A\u0645\u0643\u0646\u0643 \u062F\u0645\u062C \u0623\u0649 \u0645\u0644\u0641\u0627\u062A \u062A\u0631\u064A\u062F\u0647\u0627\u060C \u0648\u0645\u062D\u062A\u0648\u0649 \u0627\u0644\u062A\u0639\u0644\u064A\u0645 \u0633\u064A\u062A\u0645 \u062D\u0641\u0638\u0647 \u0643\u062D\u0632\u0645\u0629 \u0645\u062D\u062A\u0648\u0649\r\n\u060C(IMS)\r\n\u062D\u0632\u0645\u0629 \u0627\u0644\u0645\u062D\u062A\u0648\u0649 \u0647\u0649 \u0646\u0645\u0648\u0630\u062C \u0642\u064A\u0627\u0633\u0649 \u0644\u0627\u0633\u062A\u062E\u062F\u0627\u0645 \u0627\u0644\u062A\u0639\u0644\u0645 \u0627\u0644\u0642\u0627\u0626\u0645 \u0639\u0644\u0649 \u0627\u0644\u0648\u064A\u0628 \u0645\u0639 \u0623\u0646\u0638\u0645\u0629 \u0645\u062E\u062A\u0644\u0641\u0629 \u0648\u0627\u0644\u0648\u062D\u062F\u0627\u062A \u062A\u0639\u0644\u064A\u0645\u064A\u0629 \u0627\u0644\u062A\u0649 \u064A\u062A\u0645 \u0625\u0646\u0634\u0627\u0626\u0647\u0627 \u0628\u0627\u0633\u062A\u062E\u062F\u0627\u0645 \u0647\u0630\u0627 \u0627\u0644\u0645\u062D\u0631\u0631 \u064A\u0645\u0643\u0646 \u0623\u0646 \u064A\u062A\u0645 \u0627\u0633\u062A\u062E\u062F\u0627\u0645\u0647\u0627 \u0623\u064A\u0636\u0627 \u0645\u0639 \u0646\u0638\u0645 \u062A\u0639\u0644\u064A\u0645 \u0627\u0644\u0643\u062A\u0631\u0648\u0646\u064A \u0623\u062E\u0631\u0649\u060C \u0644\u0645\u0632\u064A\u062F \u0645\u0646 \u0627\u0644\u0645\u0639\u0644\u0648\u0645\u0627\u062A \u0639\u0646 \u062D\u0632\u0645 \u0627\u0644\u0645\u062D\u062A\u0648\u0649 \u064A\u0631\u062C\u0649 \u0627\u0644\u0630\u0647\u0627\u0628 \u0625\u0644\u0649\:
@@ -57,6 +56,7 @@ cptreecontroller.q_delete_text=\u0647\u0644 \u062A\u0631\u064A\u062F \u0641\u063
cptreecontroller.q_delete_title=\u062D\u0630\u0641\u061F
cptreecontrolller.delete.items.and.files=\u062D\u0630\u0641 \u0642\u0627\u0626\u0645\u0629 \u0627\u0644\u0639\u0646\u0635\u0631 \u0648\u0627\u0644\u0645\u0644\u0641\u0627\u062A
cptreecontrolller.delete.items.only=\u062D\u0630\u0641 \u0642\u0627\u0626\u0645\u0629 \u0627\u0644\u0639\u0646\u0635\u0631 \u0641\u0642\u0637
+help.hover=\u0645\u0633\u0627\u0639\u062F\u0629 \u0628\u0634\u0623\u0646 \u0645\u062D\u0631\u0631 \u062D\u0632\u0645\u0629 \u0627\u0644\u0645\u062D\u062A\u0648\u0649\r\nIMS
maincontroller.cp.created.with.third.party.editor=\u062D\u0632\u0645\u0629 \u0627\u0644\u0645\u062D\u062A\u0648\u0649 \u0647\u0630\u0647 \u0644\u0645 \u064A\u062A\u0645 \u0625\u0646\u0634\u0627\u0626\u0647\u0627 \u0628\u0648\u0627\u0633\u0637\u0629 \u0623\u0648\u0644\u0627\u062A\u060C \u0631\u0628\u0645\u0627 \u0644\u0627 \u064A\u0643\u0648\u0646 \u0647\u0646\u0627\u0643 \u062F\u0639\u0645 \u0643\u0627\u0645\u0644 \u0644\u0628\u0639\u0636 \u0627\u0644\u0623\u062C\u0632\u0627\u0621\u060C \u0648\u0644\u0630\u0644\u0643 \u064A\u0645\u0643\u0646 \u0623\u0646 \u062A\u0641\u0642\u062F \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0639\u0646\u062F \u062D\u0641\u0638 \u0627\u0644\u0635\u0641\u062D\u0627\u062A.
maincontroller.loaderror=<br /><i>{0}</i> \!\u062D\u062F\u062B \u062E\u0637\u0623 \u0623\u062B\u0646\u0627\u0621 \u0627\u0644\u062A\u062D\u0645\u064A\u0644
pagecontroller.title=\u062A\u0639\u062F\u064A\u0644 \u0635\u0641\u062D\u0629
diff --git a/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_bg.properties b/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_bg.properties
index 27a72af03aa..72018ca9043 100644
--- a/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_bg.properties
+++ b/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_bg.properties
@@ -1,4 +1,4 @@
-#Fri Nov 13 15:53:53 CET 2009
+#Wed Nov 04 16:51:49 CET 2015
FileResource.IMSCP=\u0421\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u0438\u0437\u0438\u0440\u0430\u043D\u043E \u0443\u0447\u0435\u0431\u043D\u043E \u0441\u044A\u0434\u044A\u0440\u0436\u0430\u043D\u0438\u0435
chelp.cpeditorhelp.add=\u0418\u0437\u0431\u0435\u0440\u0435\u0442\u0435 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0430\u0442\u0430, \u043A\u043E\u044F\u0442\u043E \u0438\u0441\u043A\u0430\u0442\u0435 \u0434\u0430 \u043F\u0440\u0438\u0431\u0430\u0432\u0438\u0442\u0435 \u043A\u0430\u0442\u043E \u043F\u043E\u0434-\u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0430, \u043F\u0440\u0435\u0434\u0438 \u0434\u0430 \u043A\u043B\u0438\u043A\u043D\u0435\u0442\u0435 \u043D\u0430 \u0431\u0443\u0442\u043E\u043D\u0430 "\u041F\u0440\u0438\u0431\u0430\u0432\u0435\u0442\u0435 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0430". \u0412\u0430\u0448\u0430\u0442\u0430 \u043F\u043E\u0434-\u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0430 \u0449\u0435 \u0431\u044A\u0434\u0435 \u043F\u0440\u0438\u0431\u0430\u0432\u0435\u043D\u0430 \u043F\u043E\u0434 \u0438\u0437\u0431\u0440\u0430\u043D\u0430\u0442\u0430 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0430, \u043E\u0431\u0430\u0447\u0435 \u0432\u0438\u0435 \u043C\u043E\u0436\u0435 \u0434\u0430 \u043C\u0435\u0441\u0442\u0438\u0442\u0435 \u043F\u043E\u0434-\u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0430\u0442\u0430, \u0430\u043A\u043E \u0436\u0435\u043B\u0430\u0435\u0442\u0435.
chelp.cpeditorhelp.add.title=\u041F\u0440\u0438\u0431\u0430\u0432\u0435\u0442\u0435 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0430
@@ -8,7 +8,6 @@ chelp.cpeditorhelp.delete=\u0417\u0430 \u0434\u0430 \u0438\u0437\u0442\u0440\u04
chelp.cpeditorhelp.delete.title=\u0418\u0437\u0442\u0440\u0438\u0439\u0442\u0435 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0430
chelp.cpeditorhelp.edit=\u0418\u0437\u0431\u0435\u0440\u0435\u0442\u0435 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0430\u0442\u0430, \u043A\u043E\u044F\u0442\u043E \u0438\u0441\u043A\u0430\u0442\u0435 \u0434\u0430 \u0440\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u0430\u0442\u0435. \u041D\u0435\u0439\u043D\u043E\u0442\u043E \u0441\u044A\u0434\u044A\u0440\u0436\u0430\u043D\u0438\u0435 \u0449\u0435 \u0431\u044A\u0434\u0435 \u043F\u043E\u043A\u0430\u0437\u0430\u043D\u043E \u0432 \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u0430, \u0437\u0430 \u0434\u0430 \u043D\u0430\u043F\u0440\u0430\u0432\u0438\u0442\u0435 \u043D\u0435\u043E\u0431\u0445\u043E\u0434\u0438\u043C\u0438\u0442\u0435 \u043F\u043E\u043F\u0440\u0430\u0432\u043A\u0438. \u0424\u043E\u0440\u043C\u0430\u0442\u0438\u0440\u0430\u043D\u0435\u0442\u043E \u0435 \u0432\u044A\u0437\u043C\u043E\u0436\u043D\u043E \u0441\u044A\u0449\u043E \u0438 \u0441 \u0431\u0443\u0442\u043E\u043D\u0438\u0442\u0435. \u041A\u043B\u0438\u043A\u043D\u0435\u0442\u0435 "\u0417\u0430\u043F\u0430\u0437\u0435\u0442\u0435" \u0432 \u0434\u043E\u043B\u043D\u0430\u0442\u0430 \u0447\u0430\u0441\u0442 \u043D\u0430 \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u0430, \u0437\u0430 \u0434\u0430 \u0441\u044A\u0445\u0440\u0430\u043D\u0438\u0442\u0435 \u043F\u0440\u043E\u043C\u0435\u043D\u0438\u0442\u0435. \u041F\u0440\u0435\u043F\u043E\u0440\u044A\u0447\u0432\u0430\u043C\u0435 \u0432\u0438 \u0434\u0430 \u0441\u044A\u0445\u0440\u0430\u043D\u044F\u0432\u0430\u0442\u0435 \u043F\u043E-\u0434\u044A\u043B\u0433\u0438 \u0442\u0435\u043A\u0441\u0442\u043E\u0432\u0435.
chelp.cpeditorhelp.edit.title=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u0430\u0439\u0442\u0435 \u0441\u044A\u0434\u044A\u0440\u0436\u0430\u043D\u0438\u0435 \u043D\u0430 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0430
-chelp.cpeditorhelp.hover=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 \u043D\u0430 IMS \u043F\u0430\u043A\u0435\u0442 \u0441\u044A\u0434\u044A\u0440\u0436\u0430\u043D\u0438\u0435\: \u041F\u043E\u043C\u043E\u0449
chelp.cpeditorhelp.import=\u0422\u0430\u0437\u0438 \u043E\u043F\u0446\u0438\u044F \u0432\u0438 \u0434\u0430\u0432\u0430 \u0432\u044A\u0437\u043C\u043E\u0436\u043D\u043E\u0441\u0442 \u0434\u0430 \u043A\u0430\u0447\u0432\u0430\u0442\u0435 \u0444\u0430\u0439\u043B\u043E\u0432\u0435 \u043A\u0430\u0442\u043E \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u044F, \u0432\u0438\u0434\u0435\u043E, HTML \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0438, \u0438 PDF \u0444\u0430\u0439\u043B\u043E\u0432\u0435 \u0432 \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u0430, \u043F\u0440\u0435\u0434\u0438 \u0434\u0430 \u0438\u043D\u0442\u0435\u0433\u0440\u0438\u0440\u0430\u0442\u0435 \u0442\u0435\u0437\u0438 \u043D\u043E\u0432\u0438 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0438 \u0432\u044A\u0432 \u0432\u0435\u0447\u0435 \u0441\u044A\u0449\u0435\u0441\u0442\u0432\u0443\u0432\u0430\u0449\u0430\u0442\u0430 \u0441\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u0430. \u0410\u043A\u043E \u0438\u0441\u043A\u0430\u0442\u0435 \u0434\u0430 \u0434\u043E\u0431\u0430\u0432\u0438\u0442\u0435 \u043D\u044F\u043A\u043E\u043B\u043A\u043E \u0444\u0430\u0439\u043B\u0430 \u043D\u0430\u0432\u0435\u0434\u043D\u044A\u0436, \u043F\u044A\u0440\u0432\u043E \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0433\u0438 \u043A\u043E\u043C\u043F\u0440\u0435\u0441\u0438\u0440\u0430\u0442\u0435, \u043F\u0440\u0435\u0434\u0438 \u0434\u0430 \u0433\u0438 \u0434\u043E\u0431\u0430\u0432\u0438\u0442\u0435 \u0432 \u043D\u043E\u0432\u0430\u0442\u0430 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0430. \u0421\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u0430\u0442\u0430 \u043D\u0430 \u0442\u043E\u0437\u0438 \u043A\u043E\u043C\u043F\u0440\u0435\u0441\u0438\u0440\u0430\u043D \u0444\u0430\u0439\u043B \u0449\u0435 \u0431\u044A\u0434\u0435 \u0434\u043E\u0431\u0430\u0432\u0435\u043D\u0430 \u0432 \u043C\u0435\u043D\u044E\u0442\u043E. \u0414\u043E\u043F\u044A\u043B\u043D\u0438\u0442\u0435\u043B\u043D\u043E \u043C\u043E\u0436\u0435 \u0434\u0430 \u0440\u0435\u0448\u0438\u0442\u0435 \u0434\u0430\u043B\u0438 \u043C\u0435\u0434\u0438\u0439\u043D\u0438 \u0444\u0430\u0439\u043B\u043E\u0432\u0435 \u043A\u0430\u0442\u043E PDF \u0438 Word \u0449\u0435 \u0431\u044A\u0434\u0430\u0442 \u0438\u043D\u0442\u0435\u0433\u0440\u0438\u0440\u0430\u043D\u0438 \u0441\u044A\u0449\u043E.<br/>\u0418\u0437\u0431\u0435\u0440\u0435\u0442\u0435 \u0441\u044A\u043E\u0442\u0432\u0435\u0442\u043D\u0430\u0442\u0430 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0430 \u043E\u0442 \u0441\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u0430\u0442\u0430 \u043F\u043E-\u0434\u043E\u043B\u0443, \u0432 \u043A\u043E\u044F\u0442\u043E \u0449\u0435 \u0431\u044A\u0434\u0430\u0442 \u0434\u043E\u0431\u0430\u0432\u0435\u043D\u0438 \u043D\u043E\u0432\u0438\u0442\u0435 \u0432\u043D\u0435\u0441\u0435\u043D\u0438 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0438. \u041A\u043B\u0438\u043A\u043D\u0435\u0442\u0435 \u0431\u0443\u0442\u043E\u043D\u0430 "\u0412\u043D\u0435\u0441\u0435\u0442\u0435 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0430" \u0432 \u0437\u0430\u0433\u043B\u0430\u0432\u043D\u0430\u0442\u0430 \u043B\u0435\u043D\u0442\u0430. \u0429\u0435 \u0441\u0435 \u043E\u0442\u0432\u043E\u0440\u0438 \u043F\u0440\u043E\u0437\u043E\u0440\u0435\u0446, \u043A\u044A\u0434\u0435\u0442\u043E \u043C\u043E\u0436\u0435\u0442\u0435 \u0434\u0430 \u0438\u0437\u0431\u0435\u0440\u0435\u0442\u0435 \u0441\u044A\u043E\u0442\u0432\u0435\u0442\u043D\u0430\u0442\u0430 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0430.
chelp.cpeditorhelp.import.title=\u0412\u043D\u0435\u0441\u0435\u0442\u0435 \u0441\u044A\u0434\u044A\u0440\u0436\u0430\u043D\u0438\u0435
chelp.cpeditorhelp.intro=\u0422\u043E\u0437\u0438 \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442 \u0432\u0438 \u0434\u0430\u0432\u0430 \u0432\u044A\u0437\u043C\u043E\u0436\u043D\u043E\u0441\u0442 \u043B\u0435\u0441\u043D\u043E \u0434\u0430 \u0441\u044A\u0437\u0434\u0430\u0432\u0430\u0442\u0435 \u0438 \u0440\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u0430\u0442\u0435 \u0443\u0447\u0435\u0431\u043D\u043E \u0441\u044A\u0434\u044A\u0440\u0436\u0430\u043D\u0438\u0435 \u0441 \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u0430. \u041E\u0441\u0432\u0435\u043D \u0442\u043E\u0432\u0430, \u043C\u043E\u0436\u0435\u0442\u0435 \u0434\u0430 \u0438\u043D\u0442\u0435\u0433\u0440\u0438\u0440\u0430\u0442\u0435 \u0432\u0441\u044F\u043A\u0430\u043A\u0432\u0438 \u0432\u0438\u0434\u043E\u0432\u0435 \u0444\u0430\u0439\u043B\u043E\u0432\u0435. \u0423\u0447\u0435\u0431\u043D\u043E\u0442\u043E \u0441\u044A\u0434\u044A\u0440\u0436\u0430\u043D\u0438\u0435 \u0449\u0435 \u0431\u044A\u0434\u0435 \u0437\u0430\u043F\u0430\u0437\u0435\u043D\u043E \u043A\u0430\u0442\u043E IMS \u043F\u0430\u043A\u0435\u0442 \u0441\u044A\u0434\u044A\u0440\u0436\u0430\u043D\u0438\u0435 (IMS \u041F\u0421). IMS \u043F\u0430\u043A\u0435\u0442 \u0441\u044A\u0434\u044A\u0440\u0436\u0430\u043D\u0438\u0435 \u0435 \u043E\u043F\u0440\u043E\u0441\u0442\u0435\u043D \u0441\u0442\u0430\u043D\u0434\u0430\u0440\u0442 \u0437\u0430 \u0438\u0437\u043F\u043E\u043B\u0437\u0432\u0430\u043D\u0435 \u043D\u0430 \u0443\u0435\u0431-\u0431\u0430\u0437\u0438\u0440\u0430\u043D\u043E \u0443\u0447\u0435\u0431\u043D\u043E \u0441\u044A\u0434\u044A\u0440\u0436\u0430\u043D\u0438\u0435 \u0441 \u0440\u0430\u0437\u043B\u0438\u0447\u043D\u0438 \u0441\u0438\u0441\u0442\u0435\u043C\u0438. \u0423\u0447\u0435\u0431\u043D\u0438 \u043C\u043E\u0434\u0443\u043B\u0438, \u0441\u044A\u0437\u0434\u0430\u0434\u0435\u043D\u0438 \u0441 \u0442\u043E\u0437\u0438 \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440, \u043C\u043E\u0433\u0430\u0442 \u0434\u0430 \u0431\u044A\u0434\u0430\u0442 \u0438\u0437\u043F\u043E\u043B\u0437\u0432\u0430\u043D\u0438 \u0441 \u0434\u0440\u0443\u0433\u0438 \u0441\u0438\u0441\u0442\u0435\u043C\u0438 \u0437\u0430 \u0435\u043B\u0435\u043A\u0442\u0440\u043E\u043D\u043D\u043E \u043E\u0431\u0443\u0447\u0435\u043D\u0438\u0435. \u0417\u0430 \u043F\u043E-\u043F\u043E\u0434\u0440\u043E\u0431\u043D\u0430 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F \u043E\u0442\u043D\u043E\u0441\u043D\u043E IMS \u041F\u0421, \u043E\u0442\u0438\u0434\u0435\u0442\u0435 \u043D\u0430\:
@@ -57,6 +56,7 @@ cptreecontroller.q_delete_text=\u041D\u0430\u0438\u0441\u0442\u0438\u043D\u0430
cptreecontroller.q_delete_title=\u0418\u0437\u0442\u0440\u0438\u0439\u0442\u0435?
cptreecontrolller.delete.items.and.files=\u0418\u0437\u0442\u0440\u0438\u0439\u0442\u0435 \u0435\u043B\u0435\u043C\u0435\u043D\u0442 \u043E\u0442 \u043C\u0435\u043D\u044E\u0442\u043E \u0438 \u0444\u0430\u0439\u043B\u043E\u0432\u0435
cptreecontrolller.delete.items.only=\u0418\u0437\u0442\u0440\u0438\u0439\u0442\u0435 \u0441\u0430\u043C\u043E \u0435\u043B\u0435\u043C\u0435\u043D\u0442 \u043E\u0442 \u043C\u0435\u043D\u044E\u0442\u043E
+help.hover=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 \u043D\u0430 IMS \u043F\u0430\u043A\u0435\u0442 \u0441\u044A\u0434\u044A\u0440\u0436\u0430\u043D\u0438\u0435\: \u041F\u043E\u043C\u043E\u0449
maincontroller.cp.created.with.third.party.editor=\u0422\u043E\u0437\u0438 \u043F\u0430\u043A\u0435\u0442 \u0441\u044A\u0434\u044A\u0440\u0436\u0430\u043D\u0438\u0435 \u043D\u0435 \u0435 \u0441\u044A\u0437\u0434\u0430\u0434\u0435\u043D \u0441\u044A\u0441 \u0441\u0438\u0441\u0442\u0435\u043C\u0430\u0442\u0430. \u041D\u044F\u043A\u043E\u0438 \u043E\u0442 \u0435\u043B\u0435\u043C\u0435\u043D\u0442\u0438\u0442\u0435 \u043C\u043E\u0436\u0435 \u0434\u0430 \u043D\u0435 \u0441\u0435 \u043F\u043E\u0434\u0434\u044A\u0440\u0436\u0430\u0442 \u043E\u0442 \u0441\u0438\u0441\u0442\u0435\u043C\u0430\u0442\u0430. \u041E\u0441\u0432\u0435\u043D \u0442\u043E\u0432\u0430, \u043C\u043E\u0436\u0435 \u0434\u0430 \u0437\u0430\u0433\u0443\u0431\u0438\u0442\u0435 \u0432\u0430\u0448\u0438\u0442\u0435 \u0434\u0430\u043D\u043D\u0438 \u043A\u043E\u0433\u0430\u0442\u043E \u0437\u0430\u043F\u0430\u0437\u0432\u0430\u0442\u0435 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0438.
maincontroller.loaderror=\u041F\u043E\u043B\u0443\u0447\u0438 \u0441\u0435 \u0433\u0440\u0435\u0448\u043A\u0430 \u043F\u0440\u0438 \u0437\u0430\u0440\u0435\u0436\u0434\u0430\u043D\u0435\u0442\u043E \u043D\u0430 \u0442\u043E\u0437\u0438 \u043C\u0430\u043D\u0438\u0444\u0435\u0441\u0442\!<br /><i>{0}</i>
pagecontroller.title=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u0430\u0439\u0442\u0435 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0430
diff --git a/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_de.properties
index 757b257fb5a..0e6f38dde81 100644
--- a/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_de.properties
@@ -1,76 +1,68 @@
+#Wed Nov 04 16:51:49 CET 2015
+FileResource.IMSCP=CP-Lerninhalt
+chelp.cpeditorhelp.add=W\u00E4hlen Sie die Seite aus, der Sie eine Unterseite hinzuf\u00FCgen wollen und bet\u00E4tigen Sie anschliessend die Symbolschaltfl\u00E4che "Seite hinzuf\u00FCgen". Die Unterseite wird direkt unter der ausgew\u00E4hlten Seite eingef\u00FCgt, Sie k\u00F6nnen diese jedoch verschieben.
+chelp.cpeditorhelp.add.title=Seite hinzuf\u00FCgen.
+chelp.cpeditorhelp.copy=Um eine Seite mit ihren Unterseiten zu kopieren, w\u00E4hlen Sie die Seite aus und bet\u00E4tigen die Symbolschaltfl\u00E4che "Seite kopieren" in der Titelleiste.\t
+chelp.cpeditorhelp.copy.title=Seite kopieren.
+chelp.cpeditorhelp.delete=Um eine Seite mit ihren Unterseiten zu l\u00F6schen, w\u00E4hlen Sie diese aus und bet\u00E4tigen die Symbolschaltfl\u00E4che "Seite l\u00F6schen" in der Titleleiste. Im Dialogfenster k\u00F6nnen Sie ausw\u00E4hlen, ob die Seite nur aus dem Navigationsmen\u00FC entfernt oder auch der entsprechende Inhalt (das HTML/PDF Dokument) gel\u00F6scht werden soll.
+chelp.cpeditorhelp.delete.title=Seite l\u00F6schen
+chelp.cpeditorhelp.edit=W\u00E4hlen Sie die Seite aus, deren Inhalt Sie editieren wollen. Der Inhalt der Seite wird im Editor angezeigt und Sie k\u00F6nnen diesen nach Belieben anpassen. Formatierungen k\u00F6nnen Sie mit den Symbolschaltfl\u00E4chen des Editors vornehmen. Bet\u00E4tigen Sie die Schaltfl\u00E4che "Speichern" unterhalb des Editor Eingabefeldes, damit Ihre Anpassungen \u00FCbernommen werden. Bei l\u00E4ngeren Texten empfiehlt sich ein Zwischenspeichern der Daten.
+chelp.cpeditorhelp.edit.title=Seiteninhalt editieren
+chelp.cpeditorhelp.import=Mit dieser Funktion haben Sie die M\u00F6glichkeit, Dateien wie z.B. Bilder, Filme, HTML-Seiten und PDFs in den Editor hochzuladen und als "Neue Seiten" in die bestehende Struktur einzuf\u00FCgen. M\u00F6chten Sie mehrere Dateien auf einmal einf\u00FCgen, m\u00FCssen Sie diese im ZIP-Dateiformat komprimieren und anschliessend die ZIP-Datei als "Neue Seite" hinzuf\u00FCgen. Die Struktur innerhalb einer ZIP-Datei wird in das Men\u00FC eingef\u00FCgt. Sie k\u00F6nnen dabei ausw\u00E4hlen, ob die enthaltenen Mediendateien wie z.B. PDF oder Word in das Men\u00FC integriert werden sollen. <br/>W\u00E4hlen Sie daf\u00FCr die Seite in der Struktur aus, unter welcher Sie die neu importierten Seiten einf\u00FCgen m\u00F6chten. Bet\u00E4tigen Sie die Symbolschaltfl\u00E4che "Seiten importieren" in der Titelleiste. Ein Dialogfenster \u00F6ffnet sich und Sie k\u00F6nnen die entsprechende Datei ausw\u00E4hlen. \t
+chelp.cpeditorhelp.import.title=Inhalt importieren.\t
+chelp.cpeditorhelp.intro=Mit diesem Werkzeug k\u00F6nnen Sie Lerninhalte einfach erstellen und editieren. Die Inhalte k\u00F6nnen direkt im Editor erfasst werden und es besteht die M\u00F6glichkeit, beliebige Dateien zu integrieren. Die Lerninhalte werden als IMS Content Packages (IMS CP) abgespeichert. IMS Content Packaging ist ein einfacher Standard, um web-basierte Lerninhalte auf verschiedenen Systemen zu verwenden. Lernmodule, die Sie mit diesem Editor erstellen, k\u00F6nnen auch in anderen E-Learning Systemen verwendet werden. Weitere Informationen zu IMS CP finden Sie unter der folgenden Adresse\:
+chelp.cpeditorhelp.move=Diese Funktion rufen Sie nicht \u00FCber die Symbolschaltfl\u00E4che der Titelleiste auf. <br/>W\u00E4hlen Sie die Seite aus, die Sie verschieben wollen und ziehen Sie diese mit gedr\u00FCckter Maustaste an ihre neue Position. Sie k\u00F6nnen Seiten jeweils unterhalb, auf gleicher Ebene oder innerhalb einer anderen Seite (als Untermen\u00FCpunkt) einf\u00FCgen.
+chelp.cpeditorhelp.move.title=Seite verschieben
+chelp.cpeditorhelp.preview=Mit der Symbolschaltfl\u00E4che "Vorschau" der Titelleiste k\u00F6nnen Sie jederzeit den aktuellen Stand Ihres Lernmodules \u00FCberpr\u00FCfen.
+chelp.cpeditorhelp.preview.title=Vorschau
+chelp.cpeditorhelp.rename=Diese Funktion rufen Sie nicht \u00FCber die Symbolschaltfl\u00E4che der Titelleiste auf. <br/>W\u00E4hlen Sie die Seite aus, die Sie umbenennen wollen. Wenn Sie den Seitennamen im Men\u00FC anw\u00E4hlen, \u00F6ffnet sich ein Eingabefeld, in welchem Sie den Namen \u00E4ndern k\u00F6nnen. Durch Bet\u00E4tigen der Escape (esc) Taste k\u00F6nnen Sie den Vorgang abbrechen. Durch Bet\u00E4tigen der Eingabetaste (enter) wird die \u00C4nderung aktiviert.
+chelp.cpeditorhelp.rename.title=Seite umbenennen
+chelp.cpeditorhelp.title=CP-Editor
+chelp.cpeditorhelp.toolbar.left=Der Editor verf\u00FCgt \u00FCber eine Titelleiste, einen Strukturbereich auf der linken Seite und ein Inhaltsfeld im zentralen Bereich. In der Titelleiste k\u00F6nnen Sie mit den Symbolen auf der linken Seite die folgenden Funktionen durchf\u00FChren\:
+chelp.cpeditorhelp.toolbar.right=Mit den Symbolen auf der rechten Seite der Titelleiste k\u00F6nnen Sie die folgenden Funktionen aufrufen\:
contentcontroller.editlink_title=Seiteneigenschaften bearbeiten
-contentcontroller.previewlink_title=Vorschau
contentcontroller.infoChapterpage=Dieses Kapitel hat keine verlinkte Seite.
-contentcontroller.page.not.found=Die verlinkte Seite konnte leider nicht gefunden werden.
contentcontroller.no.lock=Das Content-Package kann nicht bearbeitet werden, da es bereits von einem anderen Benutzer bearbeitet wird.
-
-cptreecontroller.newlink_title=Seite hinzufügen
+contentcontroller.page.not.found=Die verlinkte Seite konnte leider nicht gefunden werden.
+contentcontroller.previewlink_title=Vorschau
+cpfileuploadcontroller.form.all.types=Alle Dateien (inkl. Bilder etc.)
+cpfileuploadcontroller.form.description=Laden Sie Dateien hoch und importieren Sie diese in das Content Package. Alle Dateiformate sind erlaubt, es k\u00F6nnen aber nur HTML-Seiten bearbeitet werden. Wenn Sie eine ZIP-Datei hochladen, wird diese extrahiert und ihr Inhalt in der gegebenen Struktur eingef\u00FCgt.
+cpfileuploadcontroller.form.file.types=W\u00E4hlen Sie die Dateitypen aus, die dem Men\u00FCbaum hinzugef\u00FCgt werden sollen.
+cpfileuploadcontroller.form.title=Seiten importieren
+cpfileuploadcontroller.import.button=Importieren
+cpfileuploadcontroller.import.text=Datei
+cpfileuploadcontroller.media=Media
+cpfileuploadcontroller.no.files.imported=Das angegebene ZIP-Archiv enth\u00E4lt keine Dateien der ausgew\u00E4hlten Typen.
+cpfileuploadcontroller.pages=Inhalt
+cpfileuploadcontroller.raw=Alle Dateien
+cpfileuploadcontroller.tooBig=Datei ist zu gross. Es sind maximal {0} MB m\u00F6glich.
+cpfileuploadcontroller.virtual.root=Dateien
+cpmd.flexi.author=Autor
+cpmd.flexi.date=Datum
+cpmd.flexi.descr=Beschreibung
+cpmd.flexi.format=Format
+cpmd.flexi.formtitle=Metadaten editieren
+cpmd.flexi.keywords=Schl\u00FCsselw\u00F6rter
+cpmd.flexi.mustbefilled=Bitte dieses Feld ausf\u00FCllen
+cpmd.flexi.status=Status
+cpmd.flexi.title=Titel
+cpmd.flexi.version=Version
cptreecontroller.copylink_title=Seite kopieren
cptreecontroller.deletelink_title=Seite l\u00F6schen
-cptreecontroller.importlink_title=Seite importieren
-cptreecontroller.q_delete_title=L\u00F6schen?
-cptreecontroller.q_delete_text=Wollen Sie das folgende Element und seine Unterelemente wirklich l\u00F6schen?<br />{0}
-cptreecontrolller.delete.items.and.files=Menüelement und Dateien löschen
-cptreecontrolller.delete.items.only=Nur Menüelement löschen
-cptreecontroller.pagetitle=Element
-cptreecontroller.newpage.title=Neue Seite
cptreecontroller.file=Datei
cptreecontroller.imported.files.container=Importierte Seiten
-cptreecontroller.orga.cannot.be.deleted=Dieses Element kann nicht gel\u00F6scht werden.
+cptreecontroller.importlink_title=Seite importieren
+cptreecontroller.newlink_title=Seite hinzuf\u00FCgen
+cptreecontroller.newpage.title=Neue Seite
cptreecontroller.orga.cannot.be.copied=Dieses Element kann nicht kopiert werden.
-
-cpmd.flexi.title=Titel
-cpmd.flexi.descr=Beschreibung
-cpmd.flexi.keywords=Schl\u00FCsselw\u00F6rter
-cpmd.flexi.version=Version
-cpmd.flexi.status=Status
-cpmd.flexi.date=Datum
-cpmd.flexi.format=Format
-cpmd.flexi.author=Autor
-cpmd.flexi.mustbefilled=Bitte dieses Feld ausf\u00FCllen
-cpmd.flexi.formtitle= Metadaten editieren
-
+cptreecontroller.orga.cannot.be.deleted=Dieses Element kann nicht gel\u00F6scht werden.
+cptreecontroller.pagetitle=Element
+cptreecontroller.q_delete_text=Wollen Sie das folgende Element und seine Unterelemente wirklich l\u00F6schen?<br />{0}
+cptreecontroller.q_delete_title=L\u00F6schen?
+cptreecontrolller.delete.items.and.files=Men\u00FCelement und Dateien l\u00F6schen
+cptreecontrolller.delete.items.only=Nur Men\u00FCelement l\u00F6schen
+help.hover=Hilfe zum IMS Content Packaging Editor
+maincontroller.cp.created.with.third.party.editor=Dieses 'Content Package' wurde nicht in OLAT erstellt. M\u00F6glicherweise werden Teile davon nicht vollst\u00E4ndig unterst\u00FCtzt. Beim Speichern einer Datei kann es zu Datenverlust kommen.
maincontroller.loaderror=Beim Laden des Manifests ist ein Fehler aufgetreten\!<br /><i>{0}</i>
-maincontroller.cp.created.with.third.party.editor=Dieses 'Content Package' wurde nicht in OLAT erstellt. Möglicherweise werden Teile davon nicht vollständig unterstützt. Beim Speichern einer Datei kann es zu Datenverlust kommen.
-
-cpfileuploadcontroller.import.text=Datei
-cpfileuploadcontroller.import.button=Importieren
-cpfileuploadcontroller.form.title=Seiten importieren
-cpfileuploadcontroller.form.description=Laden Sie Dateien hoch und importieren Sie diese in das Content Package. Alle Dateiformate sind erlaubt, es können aber nur HTML-Seiten bearbeitet werden. Wenn Sie eine ZIP-Datei hochladen, wird diese extrahiert und ihr Inhalt in der gegebenen Struktur eingefügt.
-cpfileuploadcontroller.form.file.types=Wählen Sie die Dateitypen aus, die dem Menübaum hinzugefügt werden sollen.
-cpfileuploadcontroller.form.all.types=Alle Dateien (inkl. Bilder etc.)
-cpfileuploadcontroller.no.files.imported=Das angegebene ZIP-Archiv enthält keine Dateien der ausgewählten Typen.
-cpfileuploadcontroller.virtual.root=Dateien
-cpfileuploadcontroller.pages=Inhalt
-cpfileuploadcontroller.media=Media
-cpfileuploadcontroller.raw=Alle Dateien
-cpfileuploadcontroller.tooBig=Datei ist zu gross. Es sind maximal {0} MB m\u00F6glich.
-
pagecontroller.title=Seite editieren
saveandclose=Speichern und schliessen
-
-FileResource.IMSCP=CP-Lerninhalt
-
-chelp.cpeditorhelp.title = CP-Editor
-chelp.cpeditorhelp.hover = Hilfe zum IMS Content Packaging Editor
-
-chelp.cpeditorhelp.intro = Mit diesem Werkzeug können Sie Lerninhalte einfach erstellen und editieren. Die Inhalte können direkt im Editor erfasst werden und es besteht die Möglichkeit, beliebige Dateien zu integrieren. Die Lerninhalte werden als IMS Content Packages (IMS CP) abgespeichert. IMS Content Packaging ist ein einfacher Standard, um web-basierte Lerninhalte auf verschiedenen Systemen zu verwenden. Lernmodule, die Sie mit diesem Editor erstellen, können auch in anderen E-Learning Systemen verwendet werden. Weitere Informationen zu IMS CP finden Sie unter der folgenden Adresse:
-chelp.cpeditorhelp.toolbar.left=Der Editor verfügt über eine Titelleiste, einen Strukturbereich auf der linken Seite und ein Inhaltsfeld im zentralen Bereich. In der Titelleiste können Sie mit den Symbolen auf der linken Seite die folgenden Funktionen durchführen:
-chelp.cpeditorhelp.toolbar.right=Mit den Symbolen auf der rechten Seite der Titelleiste können Sie die folgenden Funktionen aufrufen:
-
-chelp.cpeditorhelp.add.title = Seite hinzufügen.
-chelp.cpeditorhelp.add = Wählen Sie die Seite aus, der Sie eine Unterseite hinzufügen wollen und betätigen Sie anschliessend die Symbolschaltfläche "Seite hinzufügen". Die Unterseite wird direkt unter der ausgewählten Seite eingefügt, Sie können diese jedoch verschieben.
-chelp.cpeditorhelp.copy.title = Seite kopieren.
-chelp.cpeditorhelp.copy = Um eine Seite mit ihren Unterseiten zu kopieren, wählen Sie die Seite aus und betätigen die Symbolschaltfläche "Seite kopieren" in der Titelleiste.
-chelp.cpeditorhelp.import.title = Inhalt importieren.
-chelp.cpeditorhelp.import = Mit dieser Funktion haben Sie die Möglichkeit, Dateien wie z.B. Bilder, Filme, HTML-Seiten und PDFs in den Editor hochzuladen und als "Neue Seiten" in die bestehende Struktur einzufügen. Möchten Sie mehrere Dateien auf einmal einfügen, müssen Sie diese im ZIP-Dateiformat komprimieren und anschliessend die ZIP-Datei als "Neue Seite" hinzufügen. Die Struktur innerhalb einer ZIP-Datei wird in das Menü eingefügt. Sie können dabei auswählen, ob die enthaltenen Mediendateien wie z.B. PDF oder Word in das Menü integriert werden sollen. <br/>Wählen Sie dafür die Seite in der Struktur aus, unter welcher Sie die neu importierten Seiten einfügen möchten. Betätigen Sie die Symbolschaltfläche "Seiten importieren" in der Titelleiste. Ein Dialogfenster öffnet sich und Sie können die entsprechende Datei auswählen.
-chelp.cpeditorhelp.move.title = Seite verschieben
-chelp.cpeditorhelp.move = Diese Funktion rufen Sie nicht über die Symbolschaltfläche der Titelleiste auf. <br/>Wählen Sie die Seite aus, die Sie verschieben wollen und ziehen Sie diese mit gedrückter Maustaste an ihre neue Position. Sie können Seiten jeweils unterhalb, auf gleicher Ebene oder innerhalb einer anderen Seite (als Untermenüpunkt) einfügen.
-chelp.cpeditorhelp.delete.title = Seite löschen
-chelp.cpeditorhelp.delete = Um eine Seite mit ihren Unterseiten zu löschen, wählen Sie diese aus und betätigen die Symbolschaltfläche "Seite löschen" in der Titleleiste. Im Dialogfenster können Sie auswählen, ob die Seite nur aus dem Navigationsmenü entfernt oder auch der entsprechende Inhalt (das HTML/PDF Dokument) gelöscht werden soll.
-chelp.cpeditorhelp.rename.title = Seite umbenennen
-chelp.cpeditorhelp.rename = Diese Funktion rufen Sie nicht über die Symbolschaltfläche der Titelleiste auf. <br/>Wählen Sie die Seite aus, die Sie umbenennen wollen. Wenn Sie den Seitennamen im Menü anwählen, öffnet sich ein Eingabefeld, in welchem Sie den Namen ändern können. Durch Betätigen der Escape (esc) Taste können Sie den Vorgang abbrechen. Durch Betätigen der Eingabetaste (enter) wird die Änderung aktiviert.
-chelp.cpeditorhelp.edit.title = Seiteninhalt editieren
-chelp.cpeditorhelp.edit = Wählen Sie die Seite aus, deren Inhalt Sie editieren wollen. Der Inhalt der Seite wird im Editor angezeigt und Sie können diesen nach Belieben anpassen. Formatierungen können Sie mit den Symbolschaltflächen des Editors vornehmen. Betätigen Sie die Schaltfläche "Speichern" unterhalb des Editor Eingabefeldes, damit Ihre Anpassungen übernommen werden. Bei längeren Texten empfiehlt sich ein Zwischenspeichern der Daten.
-chelp.cpeditorhelp.preview.title = Vorschau
-chelp.cpeditorhelp.preview = Mit der Symbolschaltfläche "Vorschau" der Titelleiste können Sie jederzeit den aktuellen Stand Ihres Lernmodules überprüfen.
\ No newline at end of file
diff --git a/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_el.properties b/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_el.properties
index 737db81aab3..94c3641c542 100644
--- a/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_el.properties
+++ b/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_el.properties
@@ -1,4 +1,4 @@
-#Wed Sep 15 10:08:02 CEST 2010
+#Wed Nov 04 16:51:49 CET 2015
FileResource.IMSCP=\u03A0\u03B5\u03C1\u03B9\u03B5\u03C7\u03CC\u03BC\u03B5\u03BD\u03BF \u03BC\u03AC\u03B8\u03B7\u03C3\u03B7\u03C2 CP
chelp.cpeditorhelp.add=\u0395\u03C0\u03B9\u03BB\u03AD\u03BE\u03C4\u03B5 \u03C4\u03B7 \u03C3\u03B5\u03BB\u03AF\u03B4\u03B1 \u03C3\u03C4\u03B7\u03BD \u03BF\u03C0\u03BF\u03AF\u03B1 \u03B8\u03AD\u03BB\u03B5\u03C4\u03B5 \u03BD\u03B1 \u03C0\u03C1\u03BF\u03C3\u03B8\u03AD\u03C3\u03B5\u03C4\u03B5 \u03C4\u03B7\u03BD \u03C5\u03C0\u03BF\u03C3\u03B5\u03BB\u03AF\u03B4\u03B1 \u03C0\u03C1\u03AF\u03BD \u03BA\u03AC\u03BD\u03B5\u03C4\u03B5 \u03BA\u03BB\u03AF\u03BA \u03C3\u03C4\u03BF \u03BA\u03BF\u03C5\u03BC\u03C0\u03AF "\u03A0\u03C1\u03BF\u03C3\u03B8\u03AE\u03BA\u03B7 \u03C3\u03B5\u03BB\u03AF\u03B4\u03B1\u03C2". \u0397 \u03C5\u03C0\u03BF\u03C3\u03B5\u03BB\u03AF\u03B4\u03B1 \u03C3\u03B1\u03C2 \u03B8\u03B1 \u03C0\u03C1\u03BF\u03C3\u03C4\u03B5\u03B8\u03B5\u03AF \u03BA\u03AC\u03C4\u03C9 \u03B1\u03BA\u03C1\u03B9\u03B2\u03CE\u03C2 \u03B1\u03C0\u03BF \u03C4\u03B7\u03BD \u03B5\u03C0\u03B9\u03BB\u03B5\u03B3\u03BC\u03AD\u03BD\u03B7 \u03C3\u03B5\u03BB\u03AF\u03B4\u03B1. \u039C\u03C0\u03BF\u03C1\u03B5\u03AF\u03C4\u03B5 \u03C9\u03C3\u03C4\u03CC\u03C3\u03BF \u03AD\u03C0\u03B5\u03B9\u03C4\u03B1, \u03BD\u03B1 \u03BC\u03B5\u03C4\u03B1\u03C6\u03AD\u03C1\u03B5\u03C4\u03B5 \u03C4\u03B7\u03BD \u03C5\u03C0\u03BF\u03C3\u03B5\u03BB\u03AF\u03B4\u03B1 \u03C3\u03B5 \u03AC\u03BB\u03BB\u03BF \u03C3\u03B7\u03BC\u03B5\u03AF\u03BF.
chelp.cpeditorhelp.add.title=\u03A0\u03C1\u03BF\u03C3\u03B8\u03AE\u03BA\u03B7 \u03C3\u03B5\u03BB\u03AF\u03B4\u03B1\u03C2
@@ -8,7 +8,6 @@ chelp.cpeditorhelp.delete=\u0393\u03B9\u03B1 \u03BD\u03B1 \u03B4\u03B9\u03B1\u03
chelp.cpeditorhelp.delete.title=\u0394\u03B9\u03B1\u03B3\u03C1\u03B1\u03C6\u03AE \u03C3\u03B5\u03BB\u03AF\u03B4\u03B1\u03C2
chelp.cpeditorhelp.edit=\u0395\u03C0\u03B9\u03BB\u03AD\u03BE\u03C4\u03B5 \u03C4\u03B7 \u03C3\u03B5\u03BB\u03AF\u03B4\u03B1 \u03C0\u03BF\u03C5 \u03B8\u03AD\u03BB\u03B5\u03C4\u03B5 \u03BD\u03B1 \u03B5\u03C0\u03B5\u03BE\u03B5\u03C1\u03B3\u03B1\u03C3\u03C4\u03B5\u03AF\u03C4\u03B5. \u03A4\u03BF \u03C0\u03B5\u03C1\u03B9\u03B5\u03C7\u03CC\u03BC\u03B5\u03BD\u03CC \u03C4\u03BF\u03C5 \u03B8\u03B1 \u03B5\u03BC\u03C6\u03B1\u03BD\u03B9\u03C3\u03C4\u03B5\u03AF \u03C3\u03C4\u03BF\u03BD \u03B5\u03C0\u03B5\u03BE\u03B5\u03C1\u03B3\u03B1\u03C3\u03C4\u03AE \u03B3\u03B9\u03B1 \u03BD\u03B1 \u03BA\u03AC\u03BD\u03B5\u03C4\u03B5 \u03BF\u03C0\u03BF\u03B9\u03B5\u03C3\u03B4\u03AE\u03C0\u03BF\u03C4\u03B5 \u03B1\u03C0\u03B1\u03C1\u03B1\u03AF\u03C4\u03B7\u03C4\u03B5\u03C2 \u03C4\u03C1\u03BF\u03C0\u03BF\u03C0\u03BF\u03B9\u03AE\u03C3\u03B5\u03B9\u03C2. \u0397 \u03BC\u03BF\u03C1\u03C6\u03BF\u03C0\u03BF\u03AF\u03B7\u03C3\u03B7 \u03B5\u03AF\u03BD\u03B1\u03B9 \u03B5\u03C0\u03AF\u03C3\u03B7\u03C2 \u03B4\u03C5\u03BD\u03B1\u03C4\u03AE \u03BC\u03B5 \u03C4\u03B7 \u03B2\u03BF\u03AE\u03B8\u03B5\u03B9\u03B1 \u03C4\u03C9\u03BD \u03BA\u03BF\u03C5\u03BC\u03C0\u03B9\u03CE\u03BD. \u0391\u03C0\u03BB\u03AC \u03BA\u03AC\u03BD\u03C4\u03B5 \u03BA\u03BB\u03AF\u03BA \u03C3\u03C4\u03BF "\u0391\u03C0\u03BF\u03B8\u03AE\u03BA\u03B5\u03C5\u03C3\u03B7" \u03C3\u03C4\u03BF \u03BA\u03AC\u03C4\u03C9 \u03C3\u03B7\u03BC\u03B5\u03AF\u03BF \u03C4\u03BF\u03C5 \u03B5\u03C0\u03B5\u03BE\u03B5\u03C1\u03B3\u03B1\u03C3\u03C4\u03AE \u03B3\u03B9\u03B1 \u03BD\u03B1 \u03B5\u03C6\u03B1\u03C1\u03BC\u03CC\u03C3\u03B5\u03C4\u03B5 \u03C4\u03B9\u03C2 \u03B1\u03BB\u03BB\u03B1\u03B3\u03AD\u03C2. \u03A3\u03B1\u03C2 \u03C0\u03C1\u03BF\u03C4\u03B5\u03AF\u03BD\u03BF\u03C5\u03BC\u03B5 \u03BD\u03B1 \u03B1\u03C0\u03BF\u03B8\u03B7\u03BA\u03B5\u03CD\u03B5\u03C4\u03B5 \u03C4\u03B1 \u03BC\u03B1\u03BA\u03C1\u03BF\u03C3\u03BA\u03B5\u03BB\u03AD\u03C3\u03C4\u03B5\u03C1\u03B1 \u03BA\u03B5\u03AF\u03BC\u03B5\u03BD\u03B1 \u03C3\u03C4\u03B7\u03BD cache.
chelp.cpeditorhelp.edit.title=\u0395\u03C0\u03B5\u03BE\u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1 \u03C0\u03B5\u03C1\u03B9\u03B5\u03C7\u03BF\u03BC\u03AD\u03BD\u03BF\u03C5 \u03C3\u03B5\u03BB\u03AF\u03B4\u03B1\u03C2
-chelp.cpeditorhelp.hover=IMS Content Packaging Editor\: \u0392\u03BF\u03AE\u03B8\u03B5\u03B9\u03B1
chelp.cpeditorhelp.import=\u0391\u03C5\u03C4\u03CC \u03C4\u03BF \u03C7\u03B1\u03C1\u03B1\u03BA\u03C4\u03B7\u03C1\u03B9\u03C3\u03C4\u03B9\u03BA\u03CC \u03C3\u03B1\u03C2 \u03B5\u03C0\u03B9\u03C4\u03C1\u03AD\u03C0\u03B5\u03B9 \u03BD\u03B1 \u03C6\u03BF\u03C1\u03C4\u03CE\u03C3\u03B5\u03C4\u03B5 \u03B1\u03C1\u03C7\u03B5\u03AF\u03B1 \u03CC\u03C0\u03C9\u03C2 \u03B5\u03B9\u03BA\u03CC\u03BD\u03B5\u03C2, \u03B2\u03AF\u03BD\u03C4\u03B5\u03BF, \u03C3\u03B5\u03BB\u03AF\u03B4\u03B5\u03C2 HTML \u03BA\u03B1\u03B9 PDF \u03C3\u03C4\u03BF \u03C3\u03C5\u03BD\u03C4\u03AC\u03BA\u03C4\u03B7 \u03C0\u03C1\u03AF\u03BD \u03B5\u03BD\u03C3\u03C9\u03BC\u03B1\u03C4\u03CE\u03C3\u03B5\u03B9 \u03C4\u03B9\u03C2 \u03BD\u03AD\u03B5\u03C2 \u03C3\u03B5\u03BB\u03AF\u03B4\u03B5\u03C2 \u03C3\u03C4\u03B7 \u03B4\u03BF\u03BC\u03AE \u03C0\u03BF\u03C5 \u03AE\u03B4\u03B7 \u03C5\u03C0\u03AC\u03C1\u03C7\u03B5\u03B9. \u0395\u03AC\u03BD \u03C0\u03C1\u03AD\u03C0\u03B5\u03B9 \u03BD\u03B1 \u03B5\u03B9\u03C3\u03AC\u03B3\u03B5\u03C4\u03B5 \u03C0\u03BF\u03BB\u03BB\u03AC \u03B1\u03C1\u03C7\u03B5\u03AF\u03B1 \u03C4\u03B1\u03C5\u03C4\u03CC\u03C7\u03C1\u03BF\u03BD\u03B1 \u03C0\u03C1\u03AD\u03C0\u03B5\u03B9 \u03BD\u03B1 \u03C4\u03B1 \u03C3\u03C5\u03BC\u03C0\u03B9\u03AD\u03C3\u03B5\u03C4\u03B5 \u03C0\u03C1\u03CE\u03C4\u03B1 \u03C0\u03C1\u03AF\u03BD \u03C0\u03C1\u03BF\u03C3\u03B8\u03AD\u03C4\u03B5\u03C4\u03B5 \u03C4\u03BF \u03BD\u03AD\u03BF \u03B1\u03C5\u03C4\u03CC \u03B1\u03C1\u03C7\u03B5\u03AF\u03BF ZIP \u03C9\u03C2 \u03BD\u03AD\u03B1 \u03C3\u03B5\u03BB\u03AF\u03B4\u03B1. \u0397 \u03B4\u03BF\u03BC\u03AE \u03BC\u03AD\u03C3\u03B1 \u03C3\u03B5 \u03B1\u03C5\u03C4\u03CC \u03C4\u03BF \u03B1\u03C1\u03C7\u03B5\u03AF\u03BF ZIP \u03B8\u03B1 \u03B5\u03B9\u03C3\u03B1\u03C7\u03B8\u03B5\u03AF \u03C3\u03C4\u03BF \u03BC\u03B5\u03BD\u03BF\u03CD. \u039C\u03C0\u03BF\u03C1\u03B5\u03AF\u03C4\u03B5 \u03C0\u03B5\u03C1\u03B1\u03B9\u03C4\u03AD\u03C1\u03C9 \u03BD\u03B1 \u03B5\u03C0\u03B9\u03BB\u03AD\u03BE\u03B5\u03C4\u03B5 \u03B5\u03AC\u03BD \u03C0\u03C1\u03AD\u03C0\u03B5\u03B9 \u03BD\u03B1 \u03B5\u03BD\u03C3\u03C9\u03BC\u03B1\u03C4\u03C9\u03B8\u03BF\u03CD\u03BD \u03B5\u03C0\u03AF\u03C3\u03B7\u03C2 \u03B1\u03C1\u03C7\u03B5\u03AF\u03B1 \u03BC\u03AD\u03C3\u03C9\u03BD \u03CC\u03C0\u03C9\u03C2 PDF \u03AE Word. <br/>\u0391\u03C0\u03BB\u03AC \u03B5\u03C0\u03B9\u03BB\u03AD\u03BE\u03C4\u03B5 \u03B5\u03BA\u03B5\u03AF\u03BD\u03B7 \u03C4\u03B7\u03BD \u03C3\u03B5\u03BB\u03AF\u03B4\u03B1 \u03C3\u03C4\u03B7 \u03B4\u03BF\u03BC\u03AE \u03BA\u03AC\u03C4\u03C9 \u03B1\u03C0\u03CC \u03C4\u03B7\u03BD \u03BF\u03C0\u03BF\u03AF\u03B1 \u03C0\u03C1\u03AD\u03C0\u03B5\u03B9 \u03BD\u03B1 \u03B5\u03B9\u03C3\u03B7\u03C7\u03B8\u03BF\u03CD\u03BD \u03BF\u03B9 \u03C0\u03C1\u03CC\u03C3\u03C6\u03B1\u03C4\u03B1 \u03B5\u03B9\u03C3\u03B1\u03B3\u03CC\u03BC\u03B5\u03BD\u03B5\u03C2 \u03C3\u03B5\u03BB\u03AF\u03B4\u03B5\u03C2 \u03C3\u03B1\u03C2. \u039A\u03AC\u03BD\u03BF\u03BD\u03C4\u03B1\u03C2 \u03BA\u03BB\u03AF\u03BA \u03C3\u03C4\u03BF \u03BA\u03BF\u03C5\u03BC\u03C0\u03AF "\u0395\u03B9\u03C3\u03B1\u03B3\u03C9\u03B3\u03AE \u03C3\u03B5\u03BB\u03AF\u03B4\u03B1\u03C2" \u03C3\u03C4\u03B7 \u03BC\u03C0\u03AC\u03C1\u03B1 \u03C4\u03AF\u03C4\u03BB\u03BF\u03C5 \u03B8\u03B1 \u03B1\u03BD\u03BF\u03AF\u03BE\u03B5\u03B9 \u03AD\u03BD\u03B1 \u03BD\u03AD\u03BF \u03C0\u03B1\u03C1\u03AC\u03B8\u03C5\u03C1\u03BF, \u03B1\u03C0\u03CC \u03C4\u03BF \u03BF\u03C0\u03BF\u03AF\u03BF \u03BC\u03C0\u03BF\u03C1\u03B5\u03AF\u03C4\u03B5 \u03AD\u03C0\u03B5\u03B9\u03C4\u03B1 \u03BD\u03B1 \u03B5\u03C0\u03B9\u03BB\u03AD\u03BE\u03B5\u03C4\u03B5 \u03C4\u03BF \u03BA\u03B1\u03C4\u03AC\u03BB\u03BB\u03B7\u03BB\u03BF \u03B1\u03C1\u03C7\u03B5\u03AF\u03BF.
chelp.cpeditorhelp.import.title=\u0395\u03B9\u03C3\u03B1\u03B3\u03C9\u03B3\u03AE \u03C0\u03B5\u03C1\u03B9\u03B5\u03C7\u03BF\u03BC\u03AD\u03BD\u03BF\u03C5
chelp.cpeditorhelp.intro=\u0391\u03C5\u03C4\u03CC \u03C4\u03BF \u03B5\u03C1\u03B3\u03B1\u03BB\u03B5\u03AF\u03BF \u03C3\u03B1\u03C2 \u03B5\u03C0\u03B9\u03C4\u03C1\u03AD\u03C0\u03B5\u03B9 \u03BD\u03B1 \u03B4\u03B7\u03BC\u03B9\u03BF\u03C5\u03C1\u03B3\u03AE\u03C3\u03B5\u03C4\u03B5 \u03BA\u03B1\u03B9 \u03BD\u03B1 \u03B5\u03C0\u03B5\u03BE\u03B5\u03C1\u03B3\u03B1\u03C3\u03C4\u03B5\u03AF\u03C4\u03B5 \u03B5\u03CD\u03BA\u03BF\u03BB\u03B1 \u03C4\u03BF \u03C0\u03B5\u03C1\u03B9\u03B5\u03C7\u03CC\u03BC\u03B5\u03BD\u03BF \u03BC\u03AC\u03B8\u03B7\u03C3\u03B7\u03C2 \u03BC\u03B5 \u03AD\u03BD\u03B1\u03BD \u03B5\u03C0\u03B5\u03BE\u03B5\u03C1\u03B3\u03B1\u03C3\u03C4\u03AE. \u0391\u03BA\u03CC\u03BC\u03B7, \u03BC\u03C0\u03BF\u03C1\u03B5\u03AF\u03C4\u03B5 \u03BD\u03B1 \u03B5\u03BD\u03C3\u03C9\u03BC\u03B1\u03C4\u03CE\u03C3\u03B5\u03C4\u03B5 \u03CC\u03C0\u03BF\u03B9\u03B1 \u03B1\u03C1\u03C7\u03B5\u03AF\u03B1 \u03B5\u03C0\u03B9\u03B8\u03C5\u03BC\u03B5\u03AF\u03C4\u03B5. \u03A4\u03BF \u03C0\u03B5\u03C1\u03B9\u03B5\u03C7\u03CC\u03BC\u03B5\u03BD\u03BF \u03BC\u03AC\u03B8\u03B7\u03C3\u03B7\u03C2 \u03BC\u03C0\u03BF\u03C1\u03B5\u03AF \u03BD\u03B1 \u03B1\u03C0\u03BF\u03B8\u03B7\u03BA\u03B5\u03C5\u03C4\u03B5\u03AF \u03C9\u03C2 \u03A0\u03B1\u03BA\u03AD\u03C4\u03B1 \u03A0\u03B5\u03C1\u03B9\u03B5\u03C7\u03BF\u03BC\u03AD\u03BD\u03BF\u03C5 IMS (IMS CP). \u03A4\u03B1 \u03A0\u03B1\u03BA\u03AD\u03C4\u03B1 \u03A0\u03B5\u03C1\u03B9\u03B5\u03C7\u03BF\u03BC\u03AD\u03BD\u03BF\u03C5 IMS \u03B5\u03AF\u03BD\u03B1\u03B9 \u03AD\u03BD\u03B1 \u03B1\u03C0\u03BB\u03CC \u03C0\u03C1\u03CC\u03C4\u03C5\u03C0\u03BF \u03C7\u03C1\u03AE\u03C3\u03B7\u03C2 \u03C0\u03B5\u03C1\u03B9\u03B5\u03C7\u03BF\u03BC\u03AD\u03BD\u03BF\u03C5 \u03BC\u03AC\u03B8\u03B7\u03C3\u03B7\u03C2 \u03B2\u03B1\u03C3\u03B9\u03C3\u03BC\u03AD\u03BD\u03BF \u03C3\u03C4\u03BF \u03B4\u03B9\u03B1\u03B4\u03AF\u03BA\u03C4\u03C5\u03BF \u03BC\u03B5 \u03B4\u03B9\u03B1\u03C6\u03BF\u03C1\u03B5\u03C4\u03B9\u03BA\u03AC \u03C3\u03C5\u03C3\u03C4\u03AE\u03BC\u03B1\u03C4\u03B1. \u03A4\u03B1 \u03BC\u03B1\u03B8\u03AE\u03BC\u03B1\u03C4\u03B1 \u03C0\u03BF\u03C5 \u03B4\u03B7\u03BC\u03B9\u03BF\u03C5\u03C1\u03B3\u03BF\u03CD\u03BD\u03C4\u03B1\u03B9 \u03BC\u03B5 \u03B1\u03C5\u03C4\u03CC\u03BD \u03C4\u03BF\u03BD \u03B5\u03C0\u03B5\u03BE\u03B5\u03C1\u03B3\u03B1\u03C3\u03C4\u03AE \u03BC\u03C0\u03BF\u03C1\u03BF\u03CD\u03BD \u03B5\u03C0\u03AF\u03C3\u03B7\u03C2 \u03BD\u03B1 \u03C7\u03C1\u03B7\u03C3\u03B9\u03BC\u03BF\u03C0\u03BF\u03B9\u03B7\u03B8\u03BF\u03CD\u03BD \u03BA\u03B1\u03B9 \u03BC\u03B5 \u03AC\u03BB\u03BB\u03B1 \u03C3\u03C5\u03C3\u03C4\u03AE\u03BC\u03B1\u03C4\u03B1 \u03B4\u03B9\u03B1\u03B4\u03B9\u03BA\u03C4\u03C5\u03B1\u03BA\u03AE\u03C2 \u03BC\u03AC\u03B8\u03B7\u03C3\u03B7\u03C2. \u0393\u03B9\u03B1 \u03C0\u03B5\u03C1\u03B9\u03C3\u03C3\u03C3\u03CC\u03C4\u03B5\u03C1\u03B5\u03C2 \u03C0\u03BB\u03B7\u03C1\u03BF\u03C6\u03BF\u03C1\u03AF\u03B5\u03C2 \u03C0\u03AC\u03BD\u03C9 \u03C3\u03C4\u03B1 IMS CP, \u03C0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03CE \u03C0\u03B7\u03B3\u03B1\u03AF\u03BD\u03B5\u03C4\u03B5 \u03C3\u03C4\u03BF\:
@@ -54,6 +53,7 @@ cptreecontroller.q_delete_text=\u0395\u03AF\u03C3\u03C4\u03B5 \u03C3\u03AF\u03B3
cptreecontroller.q_delete_title=\u0394\u03B9\u03B1\u03B3\u03C1\u03B1\u03C6\u03AE;
cptreecontrolller.delete.items.and.files=\u0394\u03B9\u03B1\u03B3\u03C1\u03B1\u03C6\u03AE \u03C3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03BF\u03C5 menu \u03BA\u03B1\u03B9 \u03B1\u03C1\u03C7\u03B5\u03AF\u03C9\u03BD
cptreecontrolller.delete.items.only=\u0394\u03B9\u03B1\u03B3\u03C1\u03B1\u03C6\u03AE \u03C3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03BF\u03C5 menu \u03BC\u03CC\u03BD\u03BF
+help.hover=IMS Content Packaging Editor\: \u0392\u03BF\u03AE\u03B8\u03B5\u03B9\u03B1
maincontroller.cp.created.with.third.party.editor=\u03A4\u03BF \u03C0\u03B1\u03BA\u03AD\u03C4\u03BF \u03C0\u03B5\u03C1\u03B9\u03B5\u03C7\u03BF\u03BC\u03AD\u03BD\u03BF\u03C5 \u03B4\u03B5 \u03B4\u03B7\u03BC\u03B9\u03BF\u03C5\u03C1\u03B3\u03AE\u03B8\u03B7\u03BA\u03B5 \u03BC\u03B5 \u03C4\u03BF OLAT. \u039A\u03AC\u03C0\u03BF\u03B9\u03B1 \u03C3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03B1 \u03BC\u03C0\u03BF\u03C1\u03B5\u03AF \u03BD\u03B1 \u03BC\u03B7\u03BD \u03C5\u03C0\u03BF\u03C3\u03C4\u03B7\u03C1\u03AF\u03B6\u03BF\u03BD\u03C4\u03B1\u03B9 \u03C0\u03BB\u03AE\u03C1\u03C9\u03C2. \u0395\u03C0\u03B9\u03C0\u03BB\u03AD\u03BF\u03BD, \u03B5\u03AF\u03BD\u03B1\u03B9 \u03C0\u03B9\u03B8\u03B1\u03BD\u03AE \u03B7 \u03B1\u03C0\u03CE\u03BB\u03B5\u03B9\u03B1 \u03B4\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03C9\u03BD \u03BA\u03B1\u03C4\u03B1 \u03C4\u03B7\u03BD \u03B1\u03C0\u03BF\u03B8\u03AE\u03BA\u03B5\u03C5\u03C3\u03B7 \u03C3\u03B5\u03BB\u03AF\u03B4\u03C9\u03BD.
maincontroller.loaderror=\u03A0\u03B1\u03C1\u03BF\u03C5\u03C3\u03B9\u03AC\u03C3\u03C4\u03B7\u03BA\u03B5 \u03C3\u03C6\u03AC\u03BB\u03BC\u03B1 \u03BA\u03B1\u03C4\u03AC \u03C4\u03BF \u03B1\u03BD\u03AD\u03B2\u03B1\u03C3\u03BC\u03B1 \u03B1\u03C5\u03C4\u03AE\u03C2 \u03C4\u03B7\u03C2 \u03B5\u03BA\u03B4\u03AE\u03BB\u03C9\u03C3\u03B7\u03C2\!<br /><i>{0}</i>
pagecontroller.title=\u0395\u03C0\u03B5\u03BE\u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1 \u03A3\u03B5\u03BB\u03AF\u03B4\u03B1\u03C2
diff --git a/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_en.properties
index 6099059bc25..8a466152097 100644
--- a/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_en.properties
@@ -1,4 +1,4 @@
-#Fri Feb 24 11:55:40 CET 2012
+#Wed Nov 04 16:51:49 CET 2015
FileResource.IMSCP=CP learning content
chelp.cpeditorhelp.add=Select the page you want to add a sub-page to before clicking on the button "Add page." Your sub-page will be added right underneath the page selected, however, you can still move your sub-page.
chelp.cpeditorhelp.add.title=Add page
@@ -8,7 +8,6 @@ chelp.cpeditorhelp.delete=To delete a page along with its sub-pages just select
chelp.cpeditorhelp.delete.title=Delete page
chelp.cpeditorhelp.edit=Select the page you want to edit. Its content will be shown in an editor to be able to make any necessary modifications. Formatting is also possible by means of buttons. Just click "Save" at the bottom of your editor to apply changes. We recommend to cache longer texts.
chelp.cpeditorhelp.edit.title=Edit page content
-chelp.cpeditorhelp.hover=IMS Content Packaging Editor\: Help
chelp.cpeditorhelp.import=This feature enables you to upload files such as pictures, videos, HTML pages, and PDFs to the editor before integrating those new pages into the structure already existing. If you need to insert several files at once you have to zip them first before adding that new ZIP file as a new page. The structure within that ZIP file will be inserted in the menu. You can further choose if media files such as PDF or Word should be integrated as well. <br/>Just select that page in the structure underneath of which your newly imported pages should be inserted. Click the button "Import page" in the title bar. A window will open from which you can then select the appropriate file.
chelp.cpeditorhelp.import.title=Import content
chelp.cpeditorhelp.intro=This tool enables you to easily create and edit your learning content with an editor. You can furthermore integrate any files you want. Learning content will be saved as IMS Content Packages (IMS CP). IMS Content Packaging is one simple standard to use web-based learning content with different systems. Learning modules created with this editor can also be used with other e-learning systems. For further information on IMS CP please go to\:
@@ -62,6 +61,7 @@ cptreecontroller.q_delete_text=Do you really want to delete the following elemen
cptreecontroller.q_delete_title=Delete?
cptreecontrolller.delete.items.and.files=Delete menu element and files
cptreecontrolller.delete.items.only=Delete menu element only
+help.hover=IMS Content Packaging Editor\: Help
maincontroller.cp.created.with.third.party.editor=This Content Package was not created in OLAT. Some parts of it might not be fully supported. Therefore you might experience data loss when saving pages.
maincontroller.loaderror=An error occurred while loading this manifest\!<br /><i>{0}</i>
pagecontroller.title=Edit page
diff --git a/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_es.properties b/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_es.properties
index 41e8374728d..3081d9a94c6 100644
--- a/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_es.properties
+++ b/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_es.properties
@@ -1,4 +1,4 @@
-#Thu Oct 22 23:49:17 CEST 2009
+#Wed Nov 04 16:51:49 CET 2015
FileResource.IMSCP=Contenido did\u00E1ctico CP
chelp.cpeditorhelp.add=Seleccione la p\u00E1gina a la que desea agregar una subp\u00E1gina antes de hacer clic en el bot\u00F3n "Agregar p\u00E1gina". La subp\u00E1gina ser\u00E1 agregada justo debajo de la p\u00E1gina seleccionada, sin embargo a\u00FAn puede mover la subp\u00E1gina de sitio.
chelp.cpeditorhelp.add.title=Agregar p\u00E1gina
@@ -8,7 +8,6 @@ chelp.cpeditorhelp.delete=Para eliminar una p\u00E1gina con sus subp\u00E1ginas
chelp.cpeditorhelp.delete.title=Eliminar p\u00E1gina
chelp.cpeditorhelp.edit=Seleccione la p\u00E1gina que desea editar. Su contenido se mostrar\u00E1 en un editor para que se efect\u00FAen las modificaciones necesarias. El formato se puede realizar por medio de botones. Haga clic en "Guardar" en el pie de su editor para aplicar los cambios. Se recomienda cachear los textos m\u00E1s largos.
chelp.cpeditorhelp.edit.title=Editar el contenido de la p\u00E1gina
-chelp.cpeditorhelp.hover=Editor IMS Content Packaging\: Ayuda
chelp.cpeditorhelp.import=Esta funci\u00F3n le permite subir archivos tales como fotos, videos, p\u00E1ginas HTML al editor antes de integrar aquellas p\u00E1ginas nuevas a las estructura existente. Si necesita insertar varios archivos de una sola vez deber\u00E1 crear un zip con estos antes de agregar un archivo ZIP como p\u00E1gina nueva. La estructura dentro de el archivo ZIP ser\u00E1 insertada en el men\u00FA. Posteriormente podr\u00E1 elegir si los archivos multimedia como PDF o Word deber\u00E1n integrarse tambi\u00E9n. <br/>S\u00F3lo seleccione la p\u00E1gina en la estructura debajo de la cual se deben insertar las p\u00E1ginas nuevas importadas. Haga clic en el bot\u00F3n "Importar p\u00E1gina" en la barra de t\u00EDtulo. Se abrir\u00E1 una ventana a partir de la cual podr\u00E1 seleccionar la p\u00E1gina que considera apropiada.
chelp.cpeditorhelp.import.title=Importar contenido
chelp.cpeditorhelp.intro=Esta herramienta le permite f\u00E1cilmente crear y editar contenido did\u00E1ctico con un editor. Asimismo, Usted puede integrar los archivos que desee. Los Contenidos Did\u00E1cticos se guardar\u00E1n como Paquetes de Contenido IMS (IMS Content Packaging). IMS Content Packaging es una norma f\u00E1cil de usar contenido did\u00E1cticos basados en web con diferentes sistemas. Los M\u00F3dulos Did\u00E1cticos creados con este editor tambi\u00E9n puede utilizarse con el correo de otros sistemas de aprendizaje. Para m\u00E1s informaci\u00F3n sobre IMS CP por favor vaya a\:
@@ -57,6 +56,7 @@ cptreecontroller.q_delete_text=\u00BFDesea realmente eliminar los siguientes ele
cptreecontroller.q_delete_title=\u00BFEliminar?
cptreecontrolller.delete.items.and.files=Eliminar elementos de men\u00FA y archivos
cptreecontrolller.delete.items.only=Eliminar elementos de men\u00FA \u00FAnicamente
+help.hover=Editor IMS Content Packaging\: Ayuda
maincontroller.cp.created.with.third.party.editor=Este 'Content Package' no fue creado con OLAT. Algunos elementos podr\u00EDan no estar totalmente soportados. Tambi\u00E9n, podr\u00EDa experimentar p\u00E9rdida de datos al guardar sus p\u00E1ginas.
maincontroller.loaderror=Ha ocurrido un erro mientras se cargaba el manifiesto\!<br /><i>{0}<i>
pagecontroller.title=Editar p\u00E1gina
diff --git a/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_fr.properties
index 88be8b587dc..db739bd6d23 100644
--- a/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_fr.properties
@@ -1,4 +1,4 @@
-#Mon Oct 22 15:02:41 CEST 2012
+#Wed Nov 04 16:51:49 CET 2015
FileResource.IMSCP=Contenu didactique CP
chelp.cpeditorhelp.add=S\u00E9lectionnez la page, \u00E0 laquelle vous voulez ajouter une sous-page et cliquez ensuite sur le bouton "Ajouter une page". La sous-page sera ins\u00E9r\u00E9e directement sous la page choisie, mais vous pouvez toujours la d\u00E9placer par la suite.
chelp.cpeditorhelp.add.title=Ajouter une page
@@ -8,7 +8,6 @@ chelp.cpeditorhelp.delete=Pour effacer une page avec ses sous-pages, s\u00E9lect
chelp.cpeditorhelp.delete.title=Effacer la page
chelp.cpeditorhelp.edit=S\u00E9lectionnez la page, dont vous voulez \u00E9diter le contenu. Le contenu de la page est affich\u00E9e dans l'\u00E9diteur et vous pouvez l'adapter selon vos besoins. Vous pouvez effectuer les formatages gr\u00E2ce au boutons symboles de l'\u00E9diteur. Cliquez sur le bouton "Enregistrer" en dessus du champs d'entr\u00E9e de l'\u00E9diteur pour appliquer les modifications. Pour des textes plus longs, il est recommand\u00E9 d'effectuer des sauvegardes interm\u00E9diaires.
chelp.cpeditorhelp.edit.title=\u00C9diter la page
-chelp.cpeditorhelp.hover=Aide pour l'\u00E9diteur IMS Content Packaging Editor
chelp.cpeditorhelp.import=Cette fonction vous permet d'ajouter des fichiers (images, films, pages HTML, pdf) dans l'\u00E9diteur et de les ins\u00E9rer comme "Nouvelle page" dans la structure existante. Si vous voulez ins\u00E9rer plusieurs fichiers en une fois, vous devez comprimer les fichier dans le format ZIP et ajouter ensuite le fichier ZIP comme "Nouvelle page". La structure comprise dans le ficher ZIP sera ins\u00E9r\u00E9e dans le menu. Vous pouvez choisir si les fichiers m\u00E9dias (pdf, word) seront int\u00E9gr\u00E9s dans le menu. <br/>S\u00E9lectionnez la page dans la structure, sous laquelle vous voulez ins\u00E9rer la page nouvellement import\u00E9e. Cliquez sur le bouton "importer page" dans le menu titre. Une fen\u00EAtre de dialogue s'ouvre et vous pouvez s\u00E9lectionner le fichier en question.
chelp.cpeditorhelp.import.title=Importer le contenu
chelp.cpeditorhelp.intro=Gr\u00E2ce \u00E0 cet outil, vous pouvez cr\u00E9er et \u00E9diter facilement du contenu didactique. Les contenus peuvent \u00EAtre saisis directement dans l'\u00E9diteur et il est possible d'int\u00E9grer des fichiers quelconques. Les contenus didactiques seront enregistr\u00E9s comme IMS Content Packages (IMS CP). IMS Content Packaging est un standard simple pour utiliser des contenus didactiques web dans de diff\u00E9rents syst\u00E8mes. Les modules didactiques que vous cr\u00E9ez avec cet \u00E9diteur peuvent aussi \u00EAtre utilis\u00E9s dans d'autres syst\u00E8mes d'apprentissage en ligne. Pour plus d'informations sur le IMS CP, consultez l'adresse suivante\:
@@ -62,6 +61,7 @@ cptreecontroller.q_delete_text=Voulez-vous vraiment effacer l'\u00E9l\u00E9ment
cptreecontroller.q_delete_title=Supprimer?
cptreecontrolller.delete.items.and.files=Supprimer l'\u00E9l\u00E9ment du menu et fichiers
cptreecontrolller.delete.items.only=Supprimer uniquement l'\u00E9l\u00E9ment du menu
+help.hover=Aide pour l'\u00E9diteur IMS Content Packaging Editor
maincontroller.cp.created.with.third.party.editor=Ce 'content package' n'a pas \u00E9t\u00E9 cr\u00E9\u00E9 dans OLAT. Il est possible que certaines parties ne sont pas compatibles. Lors de l'enregistrement d'un fichier, des donn\u00E9es peuvent \u00EAtre perdues.
maincontroller.loaderror=Lors du chargement du manifeste, une erreur s'est produite\!<br /><i>{0}</i>
pagecontroller.title=\u00C9diter page
diff --git a/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_it.properties
index fef472e2d0f..e403c64b15c 100644
--- a/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_it.properties
+++ b/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_it.properties
@@ -1,4 +1,4 @@
-#Tue Dec 21 18:39:13 CET 2010
+#Wed Nov 04 16:51:49 CET 2015
FileResource.IMSCP=Contenuto didattico CP
chelp.cpeditorhelp.add=Selezioni la pagina alla quale vuole aggiungere una sottopagina e poi clicchi sul pulsante "Aggiungere pagina". La sottopagina viene inserita direttamente sotto la pagina selezionata, ma pu\u00F2 sempre essere spostata in seguito.
chelp.cpeditorhelp.add.title=Aggiungere una pagina
@@ -8,7 +8,6 @@ chelp.cpeditorhelp.delete=Per eliminare una pagina con le sue sottopagine, selez
chelp.cpeditorhelp.delete.title=Eliminare la pagina
chelp.cpeditorhelp.edit=Selezioni la pagina che vuole editare. Il contenuto della pagina viene mostrato nell'editore, dove pu\u00F2 apportare le modifiche necessarie. La formatazione pu\u00F2 essere operata mediante i pulsanti a simbolo disponibili nell'editore. Clicchi il pulsante "Salvare" sotto il campo d'immissione dell'editore per applicare le modifiche. Se i testi sono lunghi si consiglia di salvare di tanto in tanto.
chelp.cpeditorhelp.edit.title=Editare la pagina
-chelp.cpeditorhelp.hover=Aiuto per il Content Packaging Editor IMS
chelp.cpeditorhelp.import=Questa funzione Le permette di caricare nell'editore dei file (immagini, video, pagine HTML, PDF) per poi inserirli nella struttura esistente come nuove pagine. Nel caso Lei voglia inserire pi\u00F9 file contemporaneamente, allora deve comprimere i file in formato ZIP e poi inserire il file ZIP come nuova pagina. La struttura interna al file ZIP viene ripresa nel menu, ed \u00E8 possibile decidere se i file media come PDF o Word debbano venire anch'essi integrati nel menu.<br/> Per farlo, selezioni nella struttura la pagina sotto la quale vuole integrare le pagine importate in precedenza. Clicchi il pulsante "Importare pagina" nella barra titolo. Una finestra di dialogo si aprir\u00E0 e Lei potr\u00E0 selezionare il file desiderato.
chelp.cpeditorhelp.import.title=Importare il contenuto
chelp.cpeditorhelp.intro=Con questo strumento pu\u00F2 facilmente creare ed editare contenuti didattici. I contenuti possono venire integrati direttamente nell'editore e si ha la possibilit\u00E0 di integrare qualsiasi file. I contenuti didattici vengono salvati come IMS Content Packages (IMS CP). Il IMS Content Packaging \u00E8 uno standard semplice che permette di utilizzare contenuti didattici web in sistemi diversi. I moduli didattici creati con questo editore possono venire usati anche in altri sistemi e-learning. Trova ulteriori informazioni su IMS CP all'indirizzo seguente\:
@@ -57,6 +56,7 @@ cptreecontroller.q_delete_text=Desidera veramente eliminare l'elemento seguente
cptreecontroller.q_delete_title=Eliminare?
cptreecontrolller.delete.items.and.files=Eliminare l'elemento di menu e i file
cptreecontrolller.delete.items.only=Eliminare solo l'elemento di menu
+help.hover=Aiuto per il Content Packaging Editor IMS
maincontroller.cp.created.with.third.party.editor=Questo Content Package non \u00E8 stato creato con OLAT. \u00C8 possibile che alcune parti non vengano supportate completamente\: salvando, alcuni dati possono andare perduti.
maincontroller.loaderror=Si \u00E8 verificato un errore durante il caricamento del manifesto\!<br /><i>{0}</i>
pagecontroller.title=Editare pagina
diff --git a/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_jp.properties b/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_jp.properties
index 35935cd4055..590216ea449 100644
--- a/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_jp.properties
+++ b/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_jp.properties
@@ -1,4 +1,4 @@
-#Mon Jan 31 06:13:59 CET 2011
+#Wed Nov 04 16:51:49 CET 2015
FileResource.IMSCP=CP\u5B66\u7FD2\u30B3\u30F3\u30C6\u30F3\u30C4
chelp.cpeditorhelp.add=\u300C\u30DA\u30FC\u30B8\u3092\u8FFD\u52A0\u3059\u308B\u300D\u30DC\u30BF\u30F3\u3092\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u524D\u306B\u3001\u3042\u306A\u305F\u304C\u30B5\u30D6\u30DA\u30FC\u30B8\u3092\u8FFD\u52A0\u3057\u305F\u3044\u30DA\u30FC\u30B8\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u9078\u629E\u3055\u308C\u305F\u30DA\u30FC\u30B8\u76F4\u4E0B\u306B\u30B5\u30D6\u30DA\u30FC\u30B8\u304C\u8FFD\u52A0\u3055\u308C\u307E\u3059\u3002\u3042\u306A\u305F\u306F\u30B5\u30D6\u30DA\u30FC\u30B8\u3092\u79FB\u52D5\u3059\u308B\u3053\u3068\u3082\u3067\u304D\u307E\u3059\u3002
chelp.cpeditorhelp.add.title=\u30DA\u30FC\u30B8\u3092\u8FFD\u52A0\u3059\u308B
@@ -8,7 +8,6 @@ chelp.cpeditorhelp.delete=\u30DA\u30FC\u30B8\u304A\u3088\u3073\u30B5\u30D6\u30DA
chelp.cpeditorhelp.delete.title=\u30DA\u30FC\u30B8\u3092\u524A\u9664\u3059\u308B
chelp.cpeditorhelp.edit=\u3042\u306A\u305F\u304C\u7DE8\u96C6\u3057\u305F\u3044\u30DA\u30FC\u30B8\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u5FC5\u8981\u306A\u7B87\u6240\u3092\u4FEE\u6B63\u3067\u304D\u308B\u3088\u3046\u3001\u30A8\u30C7\u30A3\u30BF\u5185\u306B\u30B3\u30F3\u30C6\u30F3\u30C4\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u30DC\u30BF\u30F3\u3092\u4F7F\u7528\u3057\u3066\u3001\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u3059\u308B\u3053\u3068\u3082\u3067\u304D\u307E\u3059\u3002\u5909\u66F4\u3092\u9069\u7528\u3059\u308B\u306B\u306F\u3001\u30A8\u30C7\u30A3\u30BF\u4E0B\u90E8\u306E\u300C\u4FDD\u5B58\u300D\u30DC\u30BF\u30F3\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u79C1\u305F\u3061\u306F\u3001\u9577\u3044\u30C6\u30AD\u30B9\u30C8\u3092\u30AD\u30E3\u30C3\u30B7\u30E5\u3059\u308B\u3053\u3068\u3092\u304A\u52E7\u3081\u3057\u307E\u3059\u3002
chelp.cpeditorhelp.edit.title=\u30DA\u30FC\u30B8\u30B3\u30F3\u30C6\u30F3\u30C4\u3092\u7DE8\u96C6\u3059\u308B
-chelp.cpeditorhelp.hover=IMS\u30B3\u30F3\u30C6\u30F3\u30C4\u30D1\u30C3\u30B1\u30FC\u30B8\u30A8\u30C7\u30A3\u30BF\: \u30D8\u30EB\u30D7
chelp.cpeditorhelp.import=\u3053\u306E\u6A5F\u80FD\u3067\u306F\u65B0\u3057\u3044\u30DA\u30FC\u30B8\u3092\u65E2\u5B58\u306E\u69CB\u9020\u306B\u7D71\u5408\u3059\u308B\u305F\u3081\u3001\u3042\u306A\u305F\u306F\u5199\u771F\u3001\u30D3\u30C7\u30AA\u3001HTML\u30DA\u30FC\u30B8\u304A\u3088\u3073PDF\u306E\u3088\u3046\u306A\u30D5\u30A1\u30A4\u30EB\u3092\u30A8\u30C7\u30A3\u30BF\u306B\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\u3042\u306A\u305F\u304C\u8907\u6570\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u540C\u6642\u306B\u8FFD\u52A0\u3059\u308B\u5FC5\u8981\u304C\u3042\u308B\u5834\u5408\u3001\u8FFD\u52A0\u3059\u308B\u524D\u306B\u305D\u308C\u3089\u306E\u30D5\u30A1\u30A4\u30EB\u3092ZIP\u5727\u7E2E\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u5727\u7E2E\u3057\u305FZIP\u30D5\u30A1\u30A4\u30EB\u306E\u69CB\u9020\u304C\u30E1\u30CB\u30E5\u30FC\u5185\u306B\u633F\u5165\u3055\u308C\u307E\u3059\u3002\u540C\u6642\u306B\u3001\u3042\u306A\u305F\u306F\u7D71\u5408\u3059\u3079\u304DPDF\u307E\u305F\u306FWord\u30D5\u30A1\u30A4\u30EB\u3092\u9078\u629E\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002<br/>\u65B0\u3057\u304F\u30A4\u30F3\u30DD\u30FC\u30C8\u3055\u308C\u308B\u30DA\u30FC\u30B8\u3092\u633F\u5165\u3059\u308B\u305F\u3081\u3001\u30DA\u30FC\u30B8\u69CB\u9020\u306E\u633F\u5165\u3057\u305F\u3044\u5834\u6240\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u30BF\u30A4\u30C8\u30EB\u30D0\u30FC\u306E\u300C\u30DA\u30FC\u30B8\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u3059\u308B\u300D\u30DC\u30BF\u30F3\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u958B\u3044\u305F\u30A6\u30A3\u30F3\u30C9\u30A6\u304B\u3089\u3001\u3042\u306A\u305F\u306F\u9069\u5207\u306A\u30D5\u30A1\u30A4\u30EB\u3092\u9078\u629E\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002
chelp.cpeditorhelp.import.title=\u30B3\u30F3\u30C6\u30F3\u30C4\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u3059\u308B
chelp.cpeditorhelp.move.title=\u30DA\u30FC\u30B8\u3092\u79FB\u52D5\u3059\u308B
@@ -54,6 +53,7 @@ cptreecontroller.q_delete_text=\u672C\u5F53\u306B\u6B21\u306E\u30A2\u30A4\u30C6\
cptreecontroller.q_delete_title=\u524A\u9664?
cptreecontrolller.delete.items.and.files=\u30E1\u30CB\u30E5\u30FC\u30A8\u30EC\u30E1\u30F3\u30C8\u304A\u3088\u3073\u30D5\u30A1\u30A4\u30EB\u3092\u524A\u9664\u3059\u308B
cptreecontrolller.delete.items.only=\u30E1\u30CB\u30E5\u30FC\u30A8\u30EC\u30E1\u30F3\u30C8\u306E\u307F\u524A\u9664\u3059\u308B
+help.hover=IMS\u30B3\u30F3\u30C6\u30F3\u30C4\u30D1\u30C3\u30B1\u30FC\u30B8\u30A8\u30C7\u30A3\u30BF\: \u30D8\u30EB\u30D7
maincontroller.cp.created.with.third.party.editor=\u3053\u306E\u30B3\u30F3\u30C6\u30F3\u30C4\u30D1\u30C3\u30B1\u30FC\u30B8\u306F\u3001OLAT\u5185\u306B\u4F5C\u6210\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u3044\u304F\u3064\u304B\u306E\u90E8\u5206\u306F\u3001\u5B8C\u5168\u306B\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u306A\u3044\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\u305D\u306E\u305F\u3081\u3001\u3042\u306A\u305F\u304C\u3053\u306E\u30DA\u30FC\u30B8\u306E\u4FDD\u5B58\u6642\u306B\u30C7\u30FC\u30BF\u30ED\u30B9\u3092\u7D4C\u9A13\u3059\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
maincontroller.loaderror=\u3053\u306E\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u306E\u8AAD\u307F\u8FBC\u307F\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\!<br /><i>{0}</i>
pagecontroller.title=\u30DA\u30FC\u30B8\u3092\u7DE8\u96C6\u3059\u308B
diff --git a/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_nl_NL.properties b/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_nl_NL.properties
index ea285dc39ba..b70c02c8233 100644
--- a/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_nl_NL.properties
+++ b/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_nl_NL.properties
@@ -1,4 +1,4 @@
-#Thu Feb 04 14:06:31 CET 2010
+#Wed Nov 04 16:51:49 CET 2015
FileResource.IMSCP=CP leerinhoud
chelp.cpeditorhelp.add=Selecteer de pagina waar u een sub-pagina aan toe wilt voegen voordat u "Pagina toevoegoen" klikt. Uw sub-pagina wordt onder de geselecteerde pagina toegevoegd, u kunt uw sub-pagina later nog verplaatsen.
chelp.cpeditorhelp.add.title=Pagina toevoegen
@@ -8,7 +8,6 @@ chelp.cpeditorhelp.delete=Om een pagina inclusief sub-pagina's te verwijderen se
chelp.cpeditorhelp.delete.title=Pagina verwijderen
chelp.cpeditorhelp.edit=Selecteer de pagina die u wilt bewerken. De inhoud zal zichtbaar worden in het tekstverwerkscherm zodat u de benodigde wijzigingen kunt maken. U kunt de tekst formatteren d.m.v. knoppen. Klik "Opslaan" onder het tekstverwerkscherm op de wijzigingen toe te passen. We raden u aan grote teksten tussentijds op te slaan.
chelp.cpeditorhelp.edit.title=Pagina inhoud bewerken
-chelp.cpeditorhelp.hover=Hulp bij de JMS Pakket Inhoud Bewerker
chelp.cpeditorhelp.import=Deze functie zorgt voor het kunnen sturen van betstanden zoals plaatjes, video's, HTML pagina's en PDF's naar het tekstverwerkingsscherm voordat u ze aan de bestaande structuur toevoegd. Als u meerdere bestanden tegelijk wilt toevoegen dient u ze eerst met ZIP in te pakken voordat u dat ZIP file als een nieuwe pagina toevoegd. De structuur van het ZIP file zal worden toegevoegd aan het menu. Verder kunt u kiezen of media bestanden zoals PDF of Word ook moeten worden toegevoegd. <br/>Selecteer in de structuur de pagina waaronder u uw zojuist geimporteerd pagina's wilt plaatsen, klik dan de "Pagina importeren" knop in de titelbalk. er opent zich een venster waarin u het gewenste bestand kunt selecteren.
chelp.cpeditorhelp.import.title=Inhoud importeren
chelp.cpeditorhelp.intro=Dit gereedschap maakt het mogelijk om gemakkelijk leer inhoud te maken en te bewerken met een tekstverwerkingsscherm. Verder kunt u alle gewenste bestanden integreren. Leer inhoud zal worden opgeslagen als "JMS Content Packages" (JMS, CP). JMS Content Packaging is een eenvoudige standaard om online leer inhoud te gebruiken met verschillende systemen. Met dit gereedschap gemaakte leermodules kunnen ook door andere onderwijssystemen worden gebruikt. Voor meer informatie over JMS CP zie\:
@@ -57,6 +56,7 @@ cptreecontroller.q_delete_text=Wilt u werkelijk dit element en alle onderliggend
cptreecontroller.q_delete_title=Verwijderen?
cptreecontrolller.delete.items.and.files=Menu element en bestanden verwijderen
cptreecontrolller.delete.items.only=Alleen menu element verwijderen
+help.hover=Hulp bij de JMS Pakket Inhoud Bewerker
maincontroller.cp.created.with.third.party.editor=Dit inhouds pakket is niet met OLAT gemaakt. Sommige delen worden waarschijnlijk niet volledig ondersteund. Ten gevolge daarvan kan er dataverlies optreden als u pagina's opslaat.
maincontroller.loaderror=Er is een fout opgetreden bij het laden van deze pakbon\!<br /><i>{0}</i>
pagecontroller.title=Pagina bewerken
diff --git a/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_pl.properties b/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_pl.properties
index 31b3be086f2..9e828937311 100644
--- a/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_pl.properties
+++ b/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_pl.properties
@@ -1,4 +1,4 @@
-#Wed Jan 16 13:18:18 CET 2013
+#Wed Nov 04 16:51:49 CET 2015
FileResource.IMSCP=Zawarto\u015B\u0107 CP
chelp.cpeditorhelp.add=Przed klikni\u0119ciem przycisku "Dodaj stron\u0119" wybierz stron\u0119, dla kt\u00F3rej chcesz utworzy\u0107 podstron\u0105. Nowa podstrona zostanie dodana tu\u017C poni\u017Cej wybranej strony, potem b\u0119dziesz m\u00F3g\u0142 j\u0105 przesun\u0105\u0107.
chelp.cpeditorhelp.add.title=Dodaj stron\u0119
@@ -8,7 +8,6 @@ chelp.cpeditorhelp.delete=Aby skasowa\u0107 stron\u0119 \u0142\u0105cznie z jej
chelp.cpeditorhelp.delete.title=Usu\u0144 stron\u0119
chelp.cpeditorhelp.edit=Zaznacz stron\u0119, kt\u00F3r\u0105 chcesz edytowa\u0107. Jej zawarto\u015B\u0107 pokaz\u0119 si\u0119 w edytorze, dzi\u0119ki temu b\u0119dziesz m\u00F3g\u0142 dokona\u0107 potrzebnych zmian. Kliknij "Zapisz" na g\u00F3rze, aby zaakceptowa\u0107 zmiany. Zalecamy zapisywa\u0107 d\u0142u\u017Csze teksty.
chelp.cpeditorhelp.edit.title=Edytuj zawarto\u015B\u0107 strony
-chelp.cpeditorhelp.hover=Edytor CP\: Pomoc
chelp.cpeditorhelp.import=To narz\u0119dzie pozwala dodawa\u0107 pliki takie jak obrazy, pliki wideo, strony HTML i dokumenty PDF do edytora przed zintegrowaniem nowych stron do struktury ju\u017C istniej\u0105cej. Je\u015Bli chcesz doda\u0107 kilka plik\u00F3w naraz, spakuj je do archiwum ZIP, potem zaimportuj ten plik ZIP jako now\u0105 ston\u0119. W menu zostanie umieszczona struktura tego pliku. W trakcie dodawania mo\u017Cesz wybra\u0107, czy dokumenty takie jak PDF lub pliki Worda maj\u0105 zosta\u0107 zintegrowane. <br />Po prostu wybierz stron\u0119, pod kt\u00F3r\u0105 pliki importowane przez ciebie powinny by\u0107 umieszczone. Potem kliknij "Importuj" na pasku tytu\u0142owym. Otworzy si\u0119 okienko, z kt\u00F3rego mo\u017Cesz wybra\u0107 odpowiednie pliki.
chelp.cpeditorhelp.import.title=Importuj zawarto\u015B\u0107
chelp.cpeditorhelp.intro=To narz\u0119dzie pozwala \u0142atwo tworzy\u0107 i edytowa\u0107 zawarto\u015B\u0107 CP, mo\u017Cesz dodawa\u0107 wszystkie pliki, jakie tylko chcesz. Zawarto\u015B\u0107 b\u0119dzie zachowana jako Pakiet CP. Standard IMS CP jest prosty, opisuje zawarto\u015B\u0107 e-learningow\u0105, kt\u00F3r\u0105 mo\u017Cna u\u017Cywa\u0107 na wielu r\u00F3\u017Cnych systemach. Pakiety CP mog\u0105 by\u0107 tworzone tym edytorem lub dowolnym innym, dost\u0119pnym na dowolnej platformie e-learningowej. Je\u015Bli potrzebujesz wi\u0119cej informacji o IMS CP, odwied\u017A poni\u017Cszy link\:
@@ -62,6 +61,7 @@ cptreecontroller.q_delete_text=Na pewno chcesz usun\u0105\u0107 nast\u0119puj\u0
cptreecontroller.q_delete_title=Usun\u0105\u0107?
cptreecontrolller.delete.items.and.files=Usu\u0144 pozycj\u0119 menu i pliki
cptreecontrolller.delete.items.only=Usu\u0144 tylko element menu
+help.hover=Edytor CP\: Pomoc
maincontroller.cp.created.with.third.party.editor=Ten pakiet nie zosta\u0142 utworzony w OLAT. Niekt\u00F3re elementy mog\u0105 nie by\u0107 obs\u0142ugiwane. Mo\u017Ce wyst\u0105pi\u0107 r\u00F3wnie\u017C utrata niekt\u00F3rych danych podczas zapisu strony.
maincontroller.loaderror=Wyst\u0105pi\u0142 b\u0142ad podczas \u0142adowania informacji\!<br /><i>{0}</i>
pagecontroller.title=Edytuj stron\u0119
diff --git a/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_pt_BR.properties
index 508fc4ed068..593d7a52da2 100644
--- a/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_pt_BR.properties
@@ -1,4 +1,4 @@
-#Mon Apr 02 17:42:05 CEST 2012
+#Wed Nov 04 16:51:49 CET 2015
FileResource.IMSCP=Conte\u00FAdo de aprendizado CP
chelp.cpeditorhelp.add=Selecione a p\u00E1gina que no qual voc\u00EA deseja adicionar uma sub-p\u00E1gina, antes de clicar no bot\u00E3o "Adicionar p\u00E1gina". Sua sub-p\u00E1gina ser\u00E1 adicionada logo abaixo da p\u00E1gina selecionada, no entanto, voc\u00EA ainda pode mover a sua sub-p\u00E1gina.
chelp.cpeditorhelp.add.title=Adicionar p\u00E1gina
@@ -8,7 +8,6 @@ chelp.cpeditorhelp.delete=Para apagar uma p\u00E1gina, juntamente com suas sub-p
chelp.cpeditorhelp.delete.title=Deletar p\u00E1gina
chelp.cpeditorhelp.edit=Selecione a p\u00E1gina que pretende editar. O seu conte\u00FAdo ser\u00E1 mostrado em um editor para poder fazer as modifica\u00E7\u00F5es necess\u00E1rias. A formata\u00E7\u00E3o tamb\u00E9m \u00E9 poss\u00EDvel por meio de bot\u00F5es. Basta clicar em "Salvar" na parte inferior do seu editor para aplicar as altera\u00E7\u00F5es. Recomendamos salvar textos longos
chelp.cpeditorhelp.edit.title=Editar conte\u00FAdo da p\u00E1gina
-chelp.cpeditorhelp.hover=Editor de empacotamento do Conte\u00FAdo IMS
chelp.cpeditorhelp.import=Esse recurso permite que voc\u00EA fa\u00E7a o upload de arquivos como fotos, v\u00EDdeos, p\u00E1ginas HTML, e PDFs para o editor antes de integrar essas novas p\u00E1ginas na estrutura j\u00E1 existente. Se voc\u00EA precisar inserir v\u00E1rios arquivos de uma vez voc\u00EA tem que comprim\u00ED-los primeiro antes de adicionar o novo arquivo ZIP como uma nova p\u00E1gina. A estrutura no arquivo ZIP ser\u00E1 inserida no menu. Pode ainda escolher se ficheiros multim\u00E9dia, tais como PDF ou Word dever\u00E3o ser integrados tamb\u00E9m. <br/> Basta selecionar a p\u00E1gina na estrutura debaixo da qual o rec\u00E9m importados p\u00E1ginas devem ser inseridos. Clique no bot\u00E3o "Importar p\u00E1gina" na barra de t\u00EDtulo. Uma janela ser\u00E1 aberta a partir do qual voc\u00EA pode ent\u00E3o selecionar a p\u00E1gina apropriada.
chelp.cpeditorhelp.import.title=Importar conte\u00FAdo
chelp.cpeditorhelp.intro=Esta ferramenta permite-lhe facilmente criar e editar os seus conte\u00FAdos did\u00E1cticos com um editor. Voc\u00EA pode ainda integrar todos os arquivos que voc\u00EA deseja. O Conte\u00FAdo did\u00E1tico ser\u00E1 guardado como IMS-CP. IMS Content Packaging \u00E9 um padr\u00E3o simples de conte\u00FAdo web que pode ser utilizado entre diferentes sistemas. M\u00F3dulos de aprendizado criados com este editor tamb\u00E9m podem ser utilizados com outros sistemas de e-learning. Para mais informa\u00E7\u00F5es sobre IMS CP por favor v\u00E1 para\:
@@ -62,6 +61,7 @@ cptreecontroller.q_delete_text=Voc\u00EA realmente deseja remover os seguintes i
cptreecontroller.q_delete_title=Remover?
cptreecontrolller.delete.items.and.files=Remover elementos do menu e arquivos
cptreecontrolller.delete.items.only=Remover o elemento do menu apenas.
+help.hover=Editor de empacotamento do Conte\u00FAdo IMS
maincontroller.cp.created.with.third.party.editor=Este pacote de conte\u00FAdo n\u00E3o foi criado no OLAT. Alguns elementos podem n\u00E3o ser totalmente compat\u00EDveis. Al\u00E9m disso, poder\u00E1 ocorrer perda de dados quando salvar p\u00E1ginas.
maincontroller.loaderror=Ocorreu um erro ao carregar este manifesto\! <br /> <i>(0)</i>
pagecontroller.title=Editar p\u00E1gina
diff --git a/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_ru.properties b/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_ru.properties
index 33b94b86058..097b8913c5b 100644
--- a/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_ru.properties
+++ b/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_ru.properties
@@ -1,10 +1,9 @@
-#Tue Jul 28 17:30:01 CEST 2009
+#Wed Nov 04 16:51:49 CET 2015
FileResource.IMSCP=\u0423\u0447\u0435\u0431\u043D\u043E\u0435 \u0441\u043E\u0434\u0435\u0440\u0436\u0430\u043D\u0438\u0435 \u0421\u0420
chelp.cpeditorhelp.add.title=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0443
chelp.cpeditorhelp.copy.title=\u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0443
chelp.cpeditorhelp.delete.title=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0443
chelp.cpeditorhelp.edit.title=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0441\u043E\u0434\u0435\u0440\u0436\u0430\u043D\u0438\u0435 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u044B
-chelp.cpeditorhelp.hover=\u041F\u043E\u043C\u043E\u0449\u044C \u043A IMS Content Packaging Editor
contentcontroller.editlink_title=\u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u044B
contentcontroller.infoChapterpage=\u042D\u0442\u0430 \u0433\u043B\u0430\u0432\u0430 \u043D\u0435 \u0441\u043E\u0434\u0435\u0440\u0436\u0438\u0442 \u0441\u0442\u0440\u0430\u043D\u0438\u0446 \u0441 \u0441\u0441\u044B\u043B\u043A\u0430\u043C\u0438.
contentcontroller.no.lock=\u041F\u0430\u043A\u0435\u0442 \u0441\u043E\u0434\u0435\u0440\u0436\u0430\u043D\u0438\u044F \u043D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u043E\u0442\u0440\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C, \u0442\u0430\u043A \u043A\u0430\u043A \u043E\u043D \u0432 \u043D\u0430\u0441\u0442\u043E\u044F\u0449\u0435\u0435 \u0432\u0440\u0435\u043C\u044F \u0440\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u0443\u0435\u0442\u0441\u044F \u0434\u0440\u0443\u0433\u0438\u043C \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u043C.
@@ -41,6 +40,7 @@ cptreecontroller.q_delete_text=\u0412\u044B \u0434\u0435\u0439\u0441\u0442\u0432
cptreecontroller.q_delete_title=\u0423\u0434\u0430\u043B\u0438\u0442\u044C?
cptreecontrolller.delete.items.and.files=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u044D\u043B\u0435\u043C\u0435\u043D\u0442 \u043C\u0435\u043D\u044E \u0438 \u0444\u0430\u0439\u043B\u044B
cptreecontrolller.delete.items.only=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0442\u043E\u043B\u044C\u043A\u043E \u044D\u043B\u0435\u043C\u0435\u043D\u0442 \u043C\u0435\u043D\u044E
+help.hover=\u041F\u043E\u043C\u043E\u0449\u044C \u043A IMS Content Packaging Editor
maincontroller.cp.created.with.third.party.editor=\u0414\u0430\u043D\u043D\u044B\u0439 "\u043F\u0430\u043A\u0435\u0442 \u0441\u043E\u0434\u0435\u0440\u0436\u0430\u043D\u0438\u044F" \u0431\u044B\u043B \u0441\u043E\u0437\u0434\u0430\u043D \u0432\u043D\u0435 \u0441\u0438\u0441\u0442\u0435\u043C\u044B OLAT. \u0412\u043E\u0437\u043C\u043E\u0436\u043D\u043E, \u0447\u0442\u043E \u043D\u0435\u043A\u043E\u0442\u043E\u0440\u044B\u0435 \u0447\u0430\u0441\u0442\u0438 \u044D\u0442\u043E\u0433\u043E \u043F\u0430\u043A\u0435\u0442\u0430 \u043D\u0435 \u0431\u0443\u0434\u0443\u0442 \u043F\u043E\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0442\u044C\u0441\u044F \u0441\u0438\u0441\u0442\u0435\u043C\u043E\u0439. \u041F\u0440\u0438 \u0441\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u0438\u0438 \u0444\u0430\u0439\u043B\u0430 \u0434\u0430\u043D\u043D\u044B\u0435 \u043C\u043E\u0433\u0443\u0442 \u0431\u044B\u0442\u044C \u043F\u043E\u0442\u0435\u0440\u044F\u043D\u044B.
maincontroller.loaderror=\u041F\u0440\u0438 \u0437\u0430\u0433\u0440\u0443\u0437\u043A\u0435 \u043C\u0430\u043D\u0438\u0444\u0435\u0441\u0442\u0430 \u043F\u0440\u043E\u0438\u0437\u043E\u0448\u043B\u0430 \u043E\u0448\u0438\u0431\u043A\u0430\!<br /><i>{0}</i>
pagecontroller.title=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0443
diff --git a/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_zh_CN.properties
index 12055e2349a..914bd4f52bd 100644
--- a/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_zh_CN.properties
@@ -1,4 +1,4 @@
-#Tue Jun 08 09:45:53 CEST 2010
+#Wed Nov 04 16:51:49 CET 2015
FileResource.IMSCP=CP\u5B66\u4E60\u5185\u5BB9
chelp.cpeditorhelp.add=\u5148\u9009\u62E9\u6BCD\u9875\uFF0C\u7136\u540E\u70B9\u51FB\u201C\u6DFB\u52A0\u9875\u9762\u201D\u6309\u94AE\uFF0C\u5C31\u4F1A\u5728\u6BCD\u9875\u4E0B\u6DFB\u52A0\u5B50\u9875\u9762\u3002\u4F60\u7684\u5B50\u9875\u9762\u5C31\u4F1A\u5728\u6BCD\u9875\u9762\u7684\u4E0B\u65B9\u53F3\u4FA7\u3002\u540C\u65F6\uFF0C\u4F60\u4ECD\u7136\u53EF\u4EE5\u79FB\u52A8\u5B50\u9875\u9762\u3002
chelp.cpeditorhelp.add.title=\u6DFB\u52A0\u9875\u9762
@@ -8,7 +8,6 @@ chelp.cpeditorhelp.delete=\u8981\u5220\u9664\u9875\u9762\u53CA\u5176\u9644\u5C5E
chelp.cpeditorhelp.delete.title=\u5220\u9664\u9875\u9762
chelp.cpeditorhelp.edit=\u9009\u62E9\u60A8\u8981\u7F16\u8F91\u7684\u9875\u9762\u3002\u9875\u9762\u7684\u5185\u5BB9\u5C06\u663E\u793A\u5728\u7F16\u8F91\u5668\u4E2D\u4EE5\u4FBF\u80FD\u591F\u8FDB\u884C\u5FC5\u8981\u7684\u4FEE\u6539\u3002\u683C\u5F0F\u4E5F\u53EF\u4EE5\u901A\u8FC7\u6309\u94AE\u7684\u65B9\u5F0F\u6765\u8BBE\u5B9A\u3002\u53EA\u8981\u6309\u4E00\u4E0B\u5728\u4F60\u7684\u7F16\u8F91\u5668\u5E95\u90E8\u7684\u201C\u4FDD\u5B58\u201C\u6309\u94AE\u5C31\u53EF\u4EE5\u5E94\u7528\u66F4\u6539\u3002\u6211\u4EEC\u5EFA\u8BAE\u4FDD\u5B58\u66F4\u957F\u3001\u66F4\u8BE6\u7EC6\u7684\u5185\u5BB9\u3002
chelp.cpeditorhelp.edit.title=\u7F16\u8F91\u9875\u9762\u5185\u5BB9
-chelp.cpeditorhelp.hover=IMS\u5185\u5BB9\u6253\u5305\u7F16\u8F91\u5668\uFF1AHelp
chelp.cpeditorhelp.import=\u6B64\u529F\u80FD\u4F7F\u60A8\u53EF\u4EE5\u4E0A\u4F20\u5982\u56FE\u7247\u3001\u89C6\u9891\u3001HTML\u9875\u9762\u3001PDF\u7B49\u6587\u4EF6\u5230\u7F16\u8F91\u5668\u4E2D\u7136\u540E\u628A\u8FD9\u4E9B\u6587\u4EF6\u878D\u5165\u73B0\u6709\u7684\u7ED3\u6784\u3002\u5982\u679C\u4F60\u8981\u540C\u65F6\u63D2\u5165\u591A\u4E2A\u6587\u4EF6\u90A3\u4E48\u4F60\u9700\u8981\u628A\u4ED6\u4EEC\u538B\u7F29\u6210ZIP\u683C\u5F0F\u7684\u6587\u4EF6\uFF0C\u7136\u540E\u628A\u8FD9\u4E2A\u538B\u7F29\u6587\u4EF6\u4E0A\u4F20\u5230\u65B0\u7684\u9875\u9762\u3002\u5305\u62EC\u90A3\u4E2AZIP\u538B\u7F29\u6587\u4EF6\u7684\u7ED3\u6784\u4E5F\u4F1A\u88AB\u63D2\u5165\u5230\u4E3B\u83DC\u5355\u4E2D\u3002\u60A8\u53EF\u4EE5\u8FDB\u4E00\u6B65\u9009\u62E9\u662F\u5426\u5C06\u5982PDF\u6216Word\u6587\u4EF6\u7684\u5A92\u4ECB\u6574\u5408\u8D77\u6765\u3002 <br/>\u53EA\u9700\u9009\u62E9\u4E0B\u9762\u7684\u7ED3\u6784\u9875\u9762\uFF0C\u4F60\u7684\u65B0\u5BFC\u5165\u7684\u9875\u9762\u5C31\u4F1A\u88AB\u63D2\u5165\u5230\u76F8\u5E94\u7684\u4E0B\u65B9\u4F4D\u7F6E\u3002\u6309\u4E00\u4E0B\u6807\u9898\u680F\u4E2D\u201C\u5BFC\u5165\u9875\u9762\u201D\u7684\u6309\u94AE\uFF0C\u5C06\u6253\u5F00\u4E00\u4E2A\u7A97\u53E3\uFF0C\u4ECE\u4E2D\u4F60\u53EF\u4EE5\u9009\u62E9\u9002\u5F53\u7684\u9875\u9762\u3002
chelp.cpeditorhelp.import.title=\u5BFC\u5165\u5185\u5BB9
chelp.cpeditorhelp.intro=\u8FD9\u4E2A\u5DE5\u5177\u53EF\u4EE5\u8BA9\u60A8\u5BB9\u6613\u7684\u4F7F\u7528\u548C\u7F16\u8F91\u60A8\u7684\u5B66\u4E60\u5185\u5BB9\u3002\u60A8\u53EF\u4EE5\u8FDB\u4E00\u6B65\u7684\u6DFB\u52A0\u4F60\u60F3\u8981\u6DFB\u52A0\u7684\u6587\u4EF6\u3002\u5B66\u4E60\u5185\u5BB9\u4F1A\u88AB\u4F5C\u4E3AIMS\u5185\u5BB9\u5305(IMS CP)\u4FDD\u5B58\u3002IMS\u5185\u5BB9\u5305\u662F\u4E00\u4E2A\u57FA\u4E8Eweb\u5B66\u4E60\u5185\u5BB9\u540C\u65F6\u652F\u6301\u591A\u79CD\u5B66\u4E60\u7BA1\u7406\u7CFB\u7EDF\u7684\u6807\u51C6\u3002\u5B66\u4E60\u6A21\u5757\u7528\u8FD9\u4E2A\u7F16\u8F91\u5668\u521B\u5EFA\uFF0C\u5B83\u53EF\u4EE5\u88AB\u7528\u5176\u4ED6\u7684\u7F51\u7EDC\u5B66\u4E60\u7CFB\u7EDF\u4F7F\u7528\u3002\u8981\u4E86\u89E3\u66F4\u591A\u5173\u4E8EIMS CP\u7684\u5185\u5BB9\u8BF7\u5230\uFF1A
@@ -57,6 +56,7 @@ cptreecontroller.q_delete_text=\u60A8\u771F\u7684\u8981\u5220\u9664\u4E0B\u9762\
cptreecontroller.q_delete_title=\u771F\u7684\u8981\u5220\u9664\u5417\uFF1F
cptreecontrolller.delete.items.and.files=\u5220\u9664\u83DC\u5355\u5143\u7D20\u548C\u6587\u4EF6
cptreecontrolller.delete.items.only=\u4EC5\u5220\u9664\u83DC\u5355\u5143\u7D20
+help.hover=IMS\u5185\u5BB9\u6253\u5305\u7F16\u8F91\u5668\uFF1AHelp
maincontroller.cp.created.with.third.party.editor=\u672C\u5185\u5BB9\u5305(CP)\u4E0D\u662F\u7531OLAT\u521B\u5EFA\u7684\u3002\u5176\u4E2D\u67D0\u4E9B\u5143\u7D20\u53EF\u80FD\u4E0D\u80FD\u5168\u90E8\u652F\u6301\u3002\u540C\u65F6\uFF0C\u5F53\u60A8\u4FDD\u5B58\u9875\u9762\u7684\u65F6\u5019\u6709\u80AF\u80FD\u4F1A\u7ECF\u5386\u6570\u636E\u7684\u4E22\u5931\u3002
maincontroller.loaderror=\u5F53\u4E0A\u4F20\u6B64\u6E05\u5355\u7684\u65F6\u5019\u53D1\u751F\u4E00\u4E2A\u9519\u8BEF\uFF01<br /><i>{0}</i>
pagecontroller.title=\u7F16\u8F91\u9875\u9762
diff --git a/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_zh_TW.properties b/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_zh_TW.properties
index 5398a864387..24313d7ad59 100644
--- a/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_zh_TW.properties
+++ b/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_zh_TW.properties
@@ -1,4 +1,4 @@
-#Tue Nov 17 11:08:14 CET 2009
+#Wed Nov 04 16:51:49 CET 2015
FileResource.IMSCP=CP \u5B78\u7FD2\u5167\u5BB9
chelp.cpeditorhelp.add=\u5728\u6309\u4E0B\u300C\u65B0\u589E\u9801\u9762\u300D\u7684\u6309\u9215\u524D\uFF0C\u9078\u64C7\u60A8\u60F3\u8981\u589E\u52A0\u5B50\u9801\u9762\u7684\u9801\u9762\u3002\u60A8\u7684\u5B50\u9801\u9762\u5C07\u88AB\u52A0\u5728\u6240\u9078\u64C7\u7684\u9801\u9762\u4E0B\u65B9\uFF0C\u4E0D\u904E\uFF0C\u60A8\u4ECD\u7136\u53EF\u4EE5\u79FB\u52D5\u60A8\u7684\u5B50\u9801\u9762\u3002
chelp.cpeditorhelp.add.title=\u65B0\u589E\u9801\u9762
@@ -8,7 +8,6 @@ chelp.cpeditorhelp.delete=\u8981\u9023\u540C\u4E00\u500B\u9801\u9762\u7684\u5B50
chelp.cpeditorhelp.delete.title=\u522A\u9664\u9801\u9762
chelp.cpeditorhelp.edit=\u9078\u64C7\u60A8\u8981\u7DE8\u8F2F\u7684\u9801\u9762\u3002\u5B83\u7684\u5167\u5BB9\u5C07\u88AB\u986F\u793A\u5728\u4E00\u500B\u7DE8\u8F2F\u5668\u4E2D\u4EE5\u4FBF\u9032\u884C\u4EFB\u4F55\u9700\u8981\u7684\u4FEE\u6539\u3002\u683C\u5F0F\u5316\u4E5F\u662F\u53EF\u4EE5\u900F\u904E\u6309\u9215\u5B8C\u6210\u3002\u8981\u5957\u7528\u6539\u8B8A\u53EA\u8981\u6309\u4E0B\u5728\u60A8\u7DE8\u8F2F\u5668\u4E0B\u65B9\u7684\u300C\u5132\u5B58\u300D\u6309\u9215\u3002\u6211\u5011\u5EFA\u8B70\u8981\u5FEB\u53D6\u8F03\u9577\u7684\u6587\u5B57\u3002
chelp.cpeditorhelp.edit.title=\u7DE8\u8F2F\u9801\u9762\u5167\u5BB9
-chelp.cpeditorhelp.hover=IMS \u5167\u5BB9\u5305\u88DD\u7DE8\u8F2F\u5668\uFF1A\u8AAA\u660E
chelp.cpeditorhelp.import=\u9019\u500B\u529F\u80FD\u8B93\u60A8\u53EF\u4EE5\u5728\u6574\u5408\u65B0\u7684\u9801\u9762\u5230\u65E2\u6709\u7684\u7D50\u69CB\u524D\u4E0A\u50B3\u8AF8\u5982\u7167\u7247\u3001\u5F71\u7247\u3001HTML \u9801\u9762\u53CA PDF \u7B49\u6A94\u6848\u5230\u7DE8\u8F2F\u5668\u3002\u5982\u679C\u60A8\u9700\u8981\u4E00\u6B21\u63D2\u5165\u6578\u500B\u6A94\u6848\uFF0C\u60A8\u5FC5\u9808\u5148\u5C07\u4ED6\u5011\u58D3\u7E2E\u6210 zip \u518D\u5C07\u6B64\u65B0\u7684 ZIP \u6A94\u63D2\u5165\u5230\u65B0\u7684\u9801\u9762\u3002\u5728 ZIP \u9EE8\u5167\u7684\u7D50\u69CB\u5C07\u88AB\u63D2\u5165\u5230\u9078\u55AE\u4E0A\uFF0C\u60A8\u53EF\u4EE5\u9032\u4E00\u6B65\u7684\u9078\u64C7\u662F\u5426\u5A92\u9AD4\u6A94\u6848\u4F8B\u5982 PDF \u6216 Word \u61C9\u8A72\u8981\u4E00\u8D77\u88AB\u6574\u5408\u9032\u4F86\u3002<br/>\u53EA\u8981\u5728\u7D50\u69CB\u4E2D\u9078\u64C7\u4E00\u500B\u9801\u9762\uFF0C\u8A72\u9801\u9762\u7684\u4E0B\u65B9\u5C31\u662F\u60A8\u65B0\u532F\u5165\u7684\u9801\u9762\u61C9\u8A72\u88AB\u63D2\u5165\u7684\u5730\u65B9\u3002\u5728\u6A19\u984C\u5217\u6309\u4E0B\u300C\u532F\u5165\u9801\u9762\u300D\u6309\u9215\u3002\u4E00\u500B\u65B0\u8996\u7A97\u5C07\u6703\u6253\u958B\uFF0C\u60A8\u53EF\u4EE5\u518D\u9078\u64C7\u9069\u7576\u7684\u9801\u9762\u3002
chelp.cpeditorhelp.import.title=\u532F\u5165\u5167\u5BB9
chelp.cpeditorhelp.intro=\u9019\u500B\u5DE5\u5177\u8B93\u60A8\u53EF\u4EE5\u8F15\u9B06\u5730\u900F\u904E\u4E00\u500B\u7DE8\u8F2F\u5668\u5EFA\u7ACB\u4E26\u7DE8\u8F2F\u60A8\u7684\u5B78\u7FD2\u5167\u5BB9\u3002\u800C\u4E14\u60A8\u53EF\u4EE5\u6574\u5408\u4EFB\u4F55\u60A8\u60F3\u8981\u7684\u6A94\u6848\u3002\u5B78\u7FD2\u5167\u5BB9\u5C07\u88AB\u5132\u5B58\u70BA IMS \u5167\u5BB9\u5305\u88DD\uFF08IMS CP)\u3002IMS \u5167\u5BB9\u5305\u88DD\u662F\u4E00\u500B\u7C21\u55AE\u7684\u6A19\u6E96\u4F86\u4F7F\u7528\u7DB2\u9801\u662F\u5B78\u7FD2\u5167\u5BB9\u5230\u4E0D\u540C\u7684\u7CFB\u7D71\u53BB\u3002\u5229\u7528\u9019\u500B\u7DE8\u8F2F\u5668\u6240\u5EFA\u7ACB\u7684\u5B78\u7FD2\u6A21\u7D44\u4E5F\u53EF\u4EE5\u88AB\u4F7F\u7528\u5728\u5176\u5B83\u7684\u6578\u4F4D\u5B78\u7FD2\u7CFB\u7D71\u3002\u8981\u7372\u5F97 IMS CP \u66F4\u9032\u4E00\u6B65\u7684\u8CC7\u8A0A\u8ACB\u524D\u5F80\uFF1A
@@ -57,6 +56,7 @@ cptreecontroller.q_delete_text=\u60A8\u78BA\u5B9A\u8981\u522A\u9664\u4E0B\u5217\
cptreecontroller.q_delete_title=\u522A\u9664?
cptreecontrolller.delete.items.and.files=\u522A\u9664\u9078\u55AE\u5143\u7D20\u548C\u6A94\u6848\u3002
cptreecontrolller.delete.items.only=\u50C5\u522A\u9664\u9078\u55AE\u5143\u7D20
+help.hover=IMS \u5167\u5BB9\u5305\u88DD\u7DE8\u8F2F\u5668\uFF1A\u8AAA\u660E
maincontroller.cp.created.with.third.party.editor=\u9019\u500B\u5167\u5BB9\u5957\u4EF6\u4E26\u975E\u7531 OLAT \u6240\u5EFA\u7ACB\u3002\u67D0\u4E9B\u5143\u7D20\u53EF\u80FD\u7121\u6CD5\u5B8C\u5168\u88AB\u652F\u63F4\u3002\u6B64\u5916\uFF0C\u7576\u5132\u5B58\u9801\u9762\u6642\u60A8\u53EF\u80FD\u6703\u78B0\u5230\u8CC7\u6599\u907A\u5931\u7684\u72C0\u6CC1\u3002
maincontroller.loaderror=\u8F09\u5165\u9019\u500B manifest \u6642\u51FA\u73FE\u4E00\u500B\u932F\u8AA4\uFF01<br /><i>{0}</i>
pagecontroller.title=\u7DE8\u8F2F\u9801\u9762
diff --git a/src/main/java/org/olat/ims/cp/ui/_i18n/i18nBundleMetadata.properties b/src/main/java/org/olat/ims/cp/ui/_i18n/i18nBundleMetadata.properties
index 896b40a05ab..e1ad8c5d379 100644
--- a/src/main/java/org/olat/ims/cp/ui/_i18n/i18nBundleMetadata.properties
+++ b/src/main/java/org/olat/ims/cp/ui/_i18n/i18nBundleMetadata.properties
@@ -1,4 +1,4 @@
-#Mon Jun 28 22:30:31 CEST 2010
+#Wed Nov 04 16:51:47 CET 2015
FileResource.IMSCP.annotation=CP-content packageing.\u5B83\u662F\u4E00\u79CD\u7F51\u7EDC\u5B66\u4E60\u5185\u5BB9\u683C\u5F0F\u3002\u65E2\u53EF\u4EE5\u7528\u5728OLAT\u7CFB\u7EDF\u4E4B\u5185\uFF0C\u4E5F\u53EF\u4EE5\u505A\u4E3A\u5916\u90E8\u8D44\u6E90\u4F7F\u7528\u5728\u5176\u4ED6\u5B66\u4E60\u7BA1\u7406\u7CFB\u7EDF\u4E0A\u3002
-chelp.cpeditorhelp.hover.annotation=IMS--Learning Management System.\u5B66\u4E60\u7BA1\u7406\u7CFB\u7EDF\uFF0C\u4EE5\u79D1\u5B66\u7684\u65B9\u5F0F\u6765\u7BA1\u7406\u8BFE\u7A0B\u3001\u5B66\u7A0B\uFF0C\u4EE5\u5E2E\u52A9\u5B66\u751F\u80FD\u591F\u81EA\u5DF1\u53BB\u5B66\u4E60\u65B0\u7684\u8BFE\u7A0B\u3002
chelp.cpeditorhelp.toolbar.left.annotation=typo "strucure" -> "structure"
+help.hover.annotation=IMS--Learning Management System.\u5B66\u4E60\u7BA1\u7406\u7CFB\u7EDF\uFF0C\u4EE5\u79D1\u5B66\u7684\u65B9\u5F0F\u6765\u7BA1\u7406\u8BFE\u7A0B\u3001\u5B66\u7A0B\uFF0C\u4EE5\u5E2E\u52A9\u5B66\u751F\u80FD\u591F\u81EA\u5DF1\u53BB\u5B66\u4E60\u65B0\u7684\u8BFE\u7A0B\u3002
diff --git a/src/main/java/org/olat/login/_i18n/LocalStrings_ar.properties b/src/main/java/org/olat/login/_i18n/LocalStrings_ar.properties
index 282ef639881..e41f3ce5cea 100644
--- a/src/main/java/org/olat/login/_i18n/LocalStrings_ar.properties
+++ b/src/main/java/org/olat/login/_i18n/LocalStrings_ar.properties
@@ -1,4 +1,4 @@
-#Thu Sep 03 11:24:43 CEST 2015
+#Wed Nov 04 22:07:24 CET 2015
about.linktext=<a href\="http\://www.openolat.org" target\="_blank"><i class\="o_icon o_icon_link_extern"> </i> www.openolat.org</a> \u0644\u0645\u0632\u064A\u062F \u0645\u0646 \u0627\u0644\u0645\u0639\u0644\u0648\u0645\u0627\u062A \u0648\u0643\u0630\u0644\u0643 \u0627\u0644\u0642\u0648\u0627\u0626\u0645 \u0627\u0644\u0628\u0631\u064A\u062F\u064A\u0629 \u0639\u0644\u0649
about.title=\u0639\u0646 \u0623\u0648\u0644\u0627\u062A
about.translate=\u0644\u063A\u0627\u062A \u0645\u062A\u0639\u062F\u062F\u0629
@@ -74,8 +74,6 @@ login.intro=\u064A\u0631\u062C\u0649 \u0627\u062F\u062E\u0627\u0644 \u0627\u0633
login.notavailable=\u062A\u062D\u0645\u064A\u0644 \u0632\u0627\u0626\u062F \u0639\u0644\u0649 \u0627\u0644\u0633\u064A\u0631\u0641\u0631\u060C \u0628\u0631\u062C\u0627\u0621 \u0627\u0644\u0645\u062D\u0627\u0648\u0644\u0629 \u0641\u0649 \u0648\u0642\u062A \u0644\u0627\u062D\u0642.
menu.about=\u0639\u0646 \u0623\u0648\u0644\u0627\u062A
menu.about.alt=\u0645\u0639\u0644\u0648\u0645\u0627\u062A \u0639\u0646 \u0623\u0648\u0644\u0627\u062A
-menu.check=\u0641\u062D\u0635 \u0627\u0644\u0645\u062A\u0635\u0641\u062D
-menu.check.alt=\u0627\u0641\u062D\u0635 \u0645\u0627 \u0625\u0630\u0627 \u0643\u0627\u0646 \u0627\u0644\u0645\u062A\u0635\u0641\u062D \u0627\u0644\u062E\u0627\u0635 \u0628\u0643 \u062A\u0645 \u0625\u0639\u062F\u0627\u062F\u0647 \u0628\u0634\u0643\u0644 \u0635\u062D\u064A\u062D.
menu.guest=\u062F\u062E\u0648\u0644 \u0632\u0627\u0626\u0631
menu.guest.alt=\u062A\u0633\u062C\u064A\u0644 \u0627\u0644\u062F\u062E\u0648\u0644 \u0643\u0632\u0627\u0626\u0631
menu.login=\u062A\u0633\u062C\u064A\u0644 \u0627\u0644\u062F\u062E\u0648\u0644
diff --git a/src/main/java/org/olat/login/_i18n/LocalStrings_bg.properties b/src/main/java/org/olat/login/_i18n/LocalStrings_bg.properties
index 8ac2863e274..9b41d19bb2f 100644
--- a/src/main/java/org/olat/login/_i18n/LocalStrings_bg.properties
+++ b/src/main/java/org/olat/login/_i18n/LocalStrings_bg.properties
@@ -1,4 +1,4 @@
-#Thu Sep 03 11:24:41 CEST 2015
+#Wed Nov 04 22:07:24 CET 2015
about.linktext=\u041F\u043E\u0432\u0435\u0447\u0435 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F, \u043A\u0430\u043A\u0442\u043E \u0438 \u0441\u043F\u0438\u0441\u044A\u0446\u0438 \u0441 \u0430\u0434\u0440\u0435\u0441\u0438, \u043C\u043E\u0436\u0435\u0442\u0435 \u0434\u0430 \u043D\u0430\u043C\u0435\u0440\u0438\u0442\u0435 \u043D\u0430 <a href\="http\://www.openolat.org" target\="_blank"><i class\="o_icon o_icon_link_extern"> </i> www.openolat.org</a>
about.title=\u0417\u0430 \u0441\u0438\u0441\u0442\u0435\u043C\u0430\u0442\u0430
about.translate=\u0420\u0430\u0437\u043B\u0438\u0447\u043D\u0438 \u0435\u0437\u0438\u0446\u0438
@@ -74,8 +74,6 @@ login.intro=\u041C\u043E\u043B\u044F, \u0432\u043B\u0435\u0437\u0442\u0435 \u043
login.notavailable=\u041F\u0440\u0435\u0442\u043E\u0432\u0430\u0440\u0432\u0430\u043D\u0435 \u043D\u0430 \u0441\u044A\u0440\u0432\u044A\u0440\u0430. \u041C\u043E\u043B\u044F, \u043E\u043F\u0438\u0442\u0430\u0439\u0442\u0435 \u043E\u0442\u043D\u043E\u0432\u043E \u043F\u043E-\u043A\u044A\u0441\u043D\u043E.
menu.about=\u0417\u0430 \u0441\u0438\u0441\u0442\u0435\u043C\u0430\u0442\u0430
menu.about.alt=\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F \u0437\u0430 \u0441\u0438\u0441\u0442\u0435\u043C\u0430\u0442\u0430
-menu.check=\u041F\u0440\u043E\u0432\u0435\u0440\u043A\u0430 \u043D\u0430 \u0431\u0440\u0430\u0443\u0437\u044A\u0440
-menu.check.alt=\u041F\u0440\u043E\u0432\u0435\u0440\u0435\u0442\u0435 \u0434\u0430\u043B\u0438 \u0432\u0430\u0448\u0438\u044F\u0442 \u0431\u0440\u0430\u0443\u0437\u044A\u0440 \u0435 \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u0430\u043D \u043F\u0440\u0430\u0432\u0438\u043B\u043D\u043E
menu.guest=\u0414\u043E\u0441\u0442\u044A\u043F \u0437\u0430 \u0433\u043E\u0441\u0442
menu.guest.alt=\u0412\u043B\u0435\u0437\u0442\u0435 \u0432 \u0441\u0438\u0441\u0442\u0435\u043C\u0430\u0442\u0430 \u043A\u0430\u0442\u043E \u0433\u043E\u0441\u0442
menu.login=\u0412\u043B\u0438\u0437\u0430\u043D\u0435 \u0432 \u0441\u0438\u0441\u0442\u0435\u043C\u0430\u0442\u0430
diff --git a/src/main/java/org/olat/login/_i18n/LocalStrings_cs.properties b/src/main/java/org/olat/login/_i18n/LocalStrings_cs.properties
index 459a4e5fce0..acb4237c896 100644
--- a/src/main/java/org/olat/login/_i18n/LocalStrings_cs.properties
+++ b/src/main/java/org/olat/login/_i18n/LocalStrings_cs.properties
@@ -1,4 +1,4 @@
-#Thu Sep 03 11:24:43 CEST 2015
+#Wed Nov 04 22:07:24 CET 2015
about.linktext=V\u00EDce informac\u00ED a MailingList najdete na <a class\="o_odkaz_extern" href\="http\://www.openolat.org" target\="_blank">www.openolat.org</a>
about.title=O OpenOLATu
about.translate=Mezin\u00E1rodn\u00ED
@@ -73,8 +73,6 @@ login.intro=P\u0159ihla\u0161te se sv\u00FDm u\u017Eivatelsk\u00FDm jm\u00E9nem
login.notavailable=Server nereaguje. Zkuste to pros\u00EDm pozd\u011Bji.
menu.about=O OpenOLATu
menu.about.alt=Informace o OpenOLATu
-menu.check=Zkou\u0161ka prohl\u00ED\u017Ee\u010De
-menu.check.alt=Zkontroluje, zda je prohl\u00ED\u017Ee\u010D spr\u00E1vn\u011B nastaven
menu.guest=P\u0159\u00EDstup pro hosty
menu.guest.alt=P\u0159ihl\u00E1sit se jako host
menu.login=P\u0159ihl\u00E1sit
diff --git a/src/main/java/org/olat/login/_i18n/LocalStrings_da.properties b/src/main/java/org/olat/login/_i18n/LocalStrings_da.properties
index 329cc9ab31c..90480f9719c 100644
--- a/src/main/java/org/olat/login/_i18n/LocalStrings_da.properties
+++ b/src/main/java/org/olat/login/_i18n/LocalStrings_da.properties
@@ -1,16 +1,11 @@
-#Wed Jul 28 13:33:31 CEST 2010
-
-
-
-
-
-about.linktext=Yderligere information og mailinglister findes p\u00E5 <a href\="http\://www.openolat.org" target\="_blank"><i class="o_icon o_icon_link_extern"> </i> www.openolat.org</a>. Dansk OpenOLAT p\u00E5 <a href\="http\://olat.translucent.dk" target\="_blank"><i class="o_icon o_icon_link_extern"> </i> olat.translucent.dk</a>
+#Wed Nov 04 22:07:24 CET 2015
+about.linktext=Yderligere information og mailinglister findes p\u00E5 <a href\="http\://www.openolat.org" target\="_blank"><i class\="o_icon o_icon_link_extern"> </i> www.openolat.org</a>. Dansk OpenOLAT p\u00E5 <a href\="http\://olat.translucent.dk" target\="_blank"><i class\="o_icon o_icon_link_extern"> </i> olat.translucent.dk</a>
about.title=Om OpenOLAT
about.translate=Overs\u00E6ttelser
about.version=Version
accesskey.back=$org.olat.core.commons.fullWebApp\:accesskey.back
-accesskey.content=$org.olat.core.commons.fullWebApp\:accesskey.content
accesskey.changes=$org.olat.core.commons.fullWebApp\:accesskey.changes
+accesskey.content=$org.olat.core.commons.fullWebApp\:accesskey.content
accesskey.menu=$org.olat.core.commons.fullWebApp\:accesskey.menu
accesskey.modal=$org.olat.core.commons.fullWebApp\:accesskey.modal
accesskey.nav=$org.olat.core.commons.fullWebApp\:accesskey.nav
@@ -21,7 +16,6 @@ accesskey.title=$org.olat.core.commons.fullWebApp\:accesskey.title
accesskey.tools=$org.olat.core.commons.fullWebApp\:accesskey.tools
accesskey.top=$org.olat.core.commons.fullWebApp\:accesskey.top
accesskey.topnav=$org.olat.core.commons.fullWebApp\:accesskey.topnav
-
browsercheck.bestresults.newerversion=eller nyere
browsercheck.bestresults.recommended=(anbefalet)
browsercheck.bestresults.title=Vi anbefaler, at du benytter en af f\u00F8lgende browsere\:
@@ -68,12 +62,8 @@ login.button=Login
login.error=<b>Ugyldigt brugernavn eller password.</b><p>Dette kan skyldes, at du har indtastet dit brugernavn eller password forkert. Pr\u00F8v igen eller kontakt {0}.</p>
login.header=OpenOLAT - infinite learning
login.intro=Log ind med dit personlige OpenOLAT-brugernavn og -password.
-
-
menu.about=Om OpenOLAT
menu.about.alt=Information om OpenOLAT
-menu.check=Browser-tjek
-menu.check.alt=Tjek, om din browser er korrekt indstillet
menu.guest=G\u00E6steadgang
menu.guest.alt=Log ind som g\u00E6st
menu.login=Login
diff --git a/src/main/java/org/olat/login/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/login/_i18n/LocalStrings_de.properties
index e0e46fb5da4..c3623f1e338 100644
--- a/src/main/java/org/olat/login/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/login/_i18n/LocalStrings_de.properties
@@ -1,47 +1,33 @@
-#Mon Mar 02 09:54:04 CET 2009
-
-
-
-
-
-
-
+#Wed Nov 04 22:07:24 CET 2015
about.copyright=Copyright und Beteiligungen
-about.elearningjournal.test.2015=Mit dem Prädikat "sehr gut" hat das renommierte eLearning-Journal das LMS OpenOLAT in einem umfassenden LMS Vergleichstest bewertet. Damit ist OpenOLAT ganz vorne mit dabei. Besonders hervorgehoben wurde der grosse Funktionsumfang der Open Source Lösung OpenOLAT.
+about.custom=
+about.custom.title=
+about.date=Z\u00FCrich, 8. Februar 2011
+about.elearningjournal.test.2015=Mit dem Pr\u00E4dikat "sehr gut" hat das renommierte eLearning-Journal das LMS OpenOLAT in einem umfassenden LMS Vergleichstest bewertet. Damit ist OpenOLAT ganz vorne mit dabei. Besonders hervorgehoben wurde der grosse Funktionsumfang der Open Source L\u00F6sung OpenOLAT.
about.financing=Finanzierung Entwicklung
-about.financing.intro=Das Open Source System OpenOLAT wird von <a href="http://www.frentix.com" target="_blank"><i class="o_icon o_icon_link_extern"> </i> frentix GmbH</a> in Zusammenarbeit mit den OpenOLAT Partnern entwickelt und finanziert. Aber auch Sie können einen Beitrag für die Zukunft von OpenOLAT leisten, indem Sie OpenOLAT finanziell unterstützen.
+about.financing.intro=Das Open Source System OpenOLAT wird von <a href\="http\://www.frentix.com" target\="_blank"><i class\="o_icon o_icon_link_extern"> </i> frentix GmbH</a> in Zusammenarbeit mit den OpenOLAT Partnern entwickelt und finanziert. Aber auch Sie k\u00F6nnen einen Beitrag f\u00FCr die Zukunft von OpenOLAT leisten, indem Sie OpenOLAT finanziell unterst\u00FCtzen.
+about.history=Das Learning-Management-System OpenOLAT wird seit 2011 in der OpenOLAT community entwickelt. OpenOLAT ist ein Fork des Open Source LMS OLAT der Universit\u00E4t Z\u00FCrich und wird weltweit in Bildungsinstitutionen und Firmen eingesetzt. OpenOLAT ist ein Open-Source-Produkt und kann frei verwendet und abge\u00E4ndert werden.
+about.linktext=Weitere Informationen sowie Mailinglisten finden Sie unter <a href\="http\://www.openolat.org" target\="_blank"><i class\="o_icon o_icon_link_extern"> </i> www.openolat.org</a>
about.partner=OpenOLAT Partner
-about.partner.intro=Die folgenden Institutionen nehmen am <a href="http://www.openolat.com/open-source-lms/partnerprogramm/" target="_blank">OpenOLAT Parternprogramm</a> teil und unterstützen aktiv die Entwicklung von OpenOLAT:
+about.partner.intro=Die folgenden Institutionen nehmen am <a href\="http\://www.openolat.com/open-source-lms/partnerprogramm/" target\="_blank">OpenOLAT Parternprogramm</a> teil und unterst\u00FCtzen aktiv die Entwicklung von OpenOLAT\:
about.social=Verbinden Sie sich mit uns auf den Sozialen Netzwerken\:
-about.date=Z\u00FCrich, 8. Februar 2011
-about.history=Das Learning-Management-System OpenOLAT wird seit 2011 in der OpenOLAT community entwickelt. OpenOLAT ist ein Fork des Open Source LMS OLAT der Universität Zürich und wird weltweit in Bildungsinstitutionen und Firmen eingesetzt. OpenOLAT ist ein Open-Source-Produkt und kann frei verwendet und abge\u00E4ndert werden.
-about.custom.title=
-about.custom=
-about.linktext=Weitere Informationen sowie Mailinglisten finden Sie unter <a href\="http\://www.openolat.org" target\="_blank"><i class="o_icon o_icon_link_extern"> </i> www.openolat.org</a>
about.title=\u00DCber OpenOLAT
about.translate=Mehrsprachigkeit
about.version=Version
accessibility.accesskeys=Mit Tastaturk\u00FCrzeln k\u00F6nnen Sie die wichtigsten Elemente des Systems direkt anspringen.
+accessibility.accesskeys.browsers=Anleitung zur Aktivierung der Tastaturk\u00FCrzel in verschiedenen Browsern.
accessibility.accesskeys1=Je nach Browser und Betriebssystem werden die Tastaturk\u00FCrzel mit der CTRL-, der ALT-Taste, der Shift-Taste oder einer Kombination davon gew\u00E4hlt.
-accessibility.accesskeys2=Für Windows XP, Windows Vista, Windows 7 und Linux Ubuntu gilt im Firefox die Tastenkombination Shift und Alt. Beim Mac OS 10.5 Betriebssystem verwenden Sie die CTRL-Taste. Dr\u00FCcken Sie also beispielsweise "Shift", "Alt" und "r" gleichzeitig, um zu den Lernressourcen zu springen.
+accessibility.accesskeys2=F\u00FCr Windows XP, Windows Vista, Windows 7 und Linux Ubuntu gilt im Firefox die Tastenkombination Shift und Alt. Beim Mac OS 10.5 Betriebssystem verwenden Sie die CTRL-Taste. Dr\u00FCcken Sie also beispielsweise "Shift", "Alt" und "r" gleichzeitig, um zu den Lernressourcen zu springen.
accessibility.accesskeys4=Die folgende Liste zeigt alle Tastaturk\u00FCrzel\:
-accessibility.accesskeys.browsers=Anleitung zur Aktivierung der Tastaturk\u00FCrzel in verschiedenen Browsern.
-
accessibility.fontsize.1=OpenOLAT legt die Schriftgr\u00F6sse nicht absolut fest.
accessibility.fontsize.2=Sie k\u00F6nnen einerseits die Schrift im Browser vergr\u00F6ssern oder verkleinern.
accessibility.fontsize.change=Andererseits k\u00F6nnen Sie die Standard-Schriftgr\u00F6sse in OpenOLAT anpassen. Sie finden diese Konfiguration im Home unter dem Menupunkt "Einstellungen".
accessibility.fontsize.title=Schriftgr\u00F6sse
accessibility.intro=OpenOLAT bietet verschiedene Optimierungen f\u00FCr eine erh\u00F6hte Zug\u00E4nglichkeit f\u00FCr sehbehinderte Personen.
accessibility.title=OpenOLAT und Barrierefreiheit
-
-
-
-
-
-
accesskey.back=$org.olat.core.commons.fullWebApp\:accesskey.back
-accesskey.content=$org.olat.core.commons.fullWebApp\:accesskey.content
accesskey.changes=$org.olat.core.commons.fullWebApp\:accesskey.changes
+accesskey.content=$org.olat.core.commons.fullWebApp\:accesskey.content
accesskey.menu=$org.olat.core.commons.fullWebApp\:accesskey.menu
accesskey.modal=$org.olat.core.commons.fullWebApp\:accesskey.modal
accesskey.nav=$org.olat.core.commons.fullWebApp\:accesskey.nav
@@ -52,10 +38,8 @@ accesskey.title=$org.olat.core.commons.fullWebApp\:accesskey.title
accesskey.tools=$org.olat.core.commons.fullWebApp\:accesskey.tools
accesskey.top=$org.olat.core.commons.fullWebApp\:accesskey.top
accesskey.topnav=$org.olat.core.commons.fullWebApp\:accesskey.topnav
-
admin.menu.title=Gast und Einladung
admin.menu.title.alt=$\:admin.menu.title
-
authentication.provider.description=Geh\u00F6ren Sie keiner der oben aufgelisteten Institutionen an oder haben ein lokales Nutzerkonto?
authentication.provider.linkText=Anmelden mit OpenOLAT Konto
browsercheck.bestresults.newerversion=oder neuere Version
@@ -73,7 +57,10 @@ browsercheck.minimum.second=Javascript muss aktiviert sein.
browsercheck.minimum.title=Minimalvoraussetzung von OpenOLAT
browsercheck.no=Nein
browsercheck.osx=Unter MacOSX sollte Safari oder Firefox verwendet werden.
-browsercheck.since=ab Version {0} unterstützt
+browsercheck.others.IE6=Der Internet Explorer 6 von Microsoft wird nicht mehr durchg\u00E4ngig unterst\u00FCtzt. Lesen Sie mehr dazu hier\:
+browsercheck.others.others=In der Regel ist OpenOLAT auch mit anderen Browsern wie dem mobile Safari in iPhone/iPad oder Opera problemlos nutzbar. F\u00FCr Administratoren und Autoren ist es dennoch empfehlenswert einen der oben genannten Browsern zu verwenden.
+browsercheck.others.title=Andere Browser
+browsercheck.since=ab Version {0} unterst\u00FCtzt
browsercheck.title=Unterst\u00FCtzte Browser
browsercheck.yes=Ja
browsercheck.yourbrowser.codename=Browser Codename\:
@@ -85,10 +72,10 @@ browsercheck.yourbrowser.name=Browser\:
browsercheck.yourbrowser.os=Betriebssystem\:
browsercheck.yourbrowser.title=Sie verwenden folgenden Browser\:
browsercheck.yourbrowser.usragent=User agent\:
-browsercheck.others.title=Andere Browser
-browsercheck.others.others=In der Regel ist OpenOLAT auch mit anderen Browsern wie dem mobile Safari in iPhone/iPad oder Opera problemlos nutzbar. Für Administratoren und Autoren ist es dennoch empfehlenswert einen der oben genannten Browsern zu verwenden.
-browsercheck.others.IE6=Der Internet Explorer 6 von Microsoft wird nicht mehr durchgängig unterstützt. Lesen Sie mehr dazu hier:
+chelp.about.title=\u00DCber OpenOLAT
chelp.about1=Hier finden Sie die Lizenzbestimmungen f\u00FCr den Einsatz von OpenOLAT.
+chelp.accessibility.title=Barrierefreiheit
+chelp.browsercheck.title=Browsercheck
chelp.check1=Testen Sie, ob Ihr Browser so eingestellt ist, dass die Funktionali\u00E4t von OpenOLAT einwandfrei genutzt werden kann.
chelp.dmz.title=OpenOLAT-Einstieg
chelp.forg1=Klicken Sie hier, um Hilfe zu erhalten, falls Sie Ihr Passwort vergessen haben.
@@ -97,37 +84,33 @@ chelp.guest2=Als Gast haben Sie eine beschr\u00E4nkte Funktionalit\u00E4t zu Aus
chelp.log1=Auf der Einstiegsseite w\u00E4hlen Sie Ihre Hochschule aus. Sie werden weitergeleitet und aufgefordert, Ihre Zugangsdaten einzugeben.
chelp.log2=So k\u00F6nnen Sie die volle Funktionalit\u00E4t von OpenOLAT benutzen.
chelp.log3=Wenn Sie keiner der aufgelisteten Hochschulen angeh\u00F6ren, w\u00E4hlen Sie <i>$\:login.altprovider</i>
-chelp.about.title=\u00DCber OpenOLAT
-chelp.accessibility.title=Barrierefreiheit
-chelp.browsercheck.title=Browsercheck
+default.shib.intro=Sie werden zur Authentifizierung weitergeleitet.
+enabled=ein
+guest.login=Gastlogin auf Login Seite
+guest.login.links=Links f\u00FCr Gast
+invitation.login=Einladung erlauben
lf.error.loginempty=Bitte geben Sie einen Benutzernamen ein.
lf.error.passempty=Bitte geben Sie ein Passwort ein.
lf.login=OpenOLAT-Benutzername
lf.pass=OpenOLAT-Passwort
+loadtest.warn=Achtung\! Loadtestmode ist eingeschaltet\!
login.admin.title=Gast und Einladung
login.altprovider=Alternative M\u00F6glichkeiten f\u00FCr Login
login.blocked=<b>Anmeldung ist f\u00FCr diesen Benutzernamen gesperrt.</b><p><font size\="-1">Es wurden zu viele ung\u00FCltige Anmeldeversuche registriert. Eine Anmeldung mit diesem Benutzernamen wurde aus Sicherheitsgr\u00FCnden f\u00FCr die n\u00E4chsten {0} Minuten gesperrt.</p></font>
login.blocked.forAll=Logins sind momentan gesperrt. Probieren Sie es bitte sp\u00E4ter noch einmal.
login.browserswitch=Ihr Internet-Browser unterst\u00FCtzt nicht alle Funktionen in OpenOLAT. Beste Resultate erhalten Sie mit <a href\="http\://www.mozilla.org/de/firefox/">Firefox ab Version 12.</a> sowie Internet Explorer ab Version 9
login.button=Login
-login.error=Benutzername oder Passwort falsch. Bitte versuchen Sie es erneut oder nutzen Sie die Funktion "$:menu.pw".
+login.customfootermsg=
+login.custommsg=
+login.error=Benutzername oder Passwort falsch. Bitte versuchen Sie es erneut oder nutzen Sie die Funktion "$\:menu.pw".
login.form=OpenOLAT Anmeldung
login.header=OpenOLAT - infinite learning
login.intro=Bitte melden Sie sich mit Ihrem pers\u00F6nlichen OpenOLAT-Benutzernamen und Passwort an.
-login.notavailable=Der Server ist zur Zeit überlastet. Bitte probieren Sie es sp\u00E4ter nochmals.
-login.custommsg=
-
-login.customfootermsg=
-
-guest.login=Gastlogin auf Login Seite
-guest.login.links=Links für Gast
-invitation.login=Einladung erlauben
-enabled=ein
-
+login.notavailable=Der Server ist zur Zeit \u00FCberlastet. Bitte probieren Sie es sp\u00E4ter nochmals.
+mail.pwd.body=Das Passwort f\u00FCr Ihren OpenOLAT Account {0} mit der Email {1} wurde soeben von {2} neu gesetzt.\n\n\nWenn Sie mit dieser \u00C4nderung nicht einverstanden sind oder denken, dass Ihr Zugang von dritten kompromittiert wurde, dann melden Sie sich bitte unverz\u00FCglich beim Support unter {3} oder w\u00E4hlen Sie den Link {4} um das Passwort erneut zu \u00E4ndern.
+mail.pwd.subject=Neues Passwort in OpenOLAT
menu.about=\u00DCber OpenOLAT
menu.about.alt=Informationen zu OpenOLAT
-menu.check=Browsercheck
-menu.check.alt=Pr\u00FCfen Sie, ob Ihr Browser korrekt konfiguriert ist
menu.guest=Gastzugang
menu.guest.alt=Melden Sie sich als Gast an
menu.login=Login
@@ -137,18 +120,14 @@ menu.register=<small>Kein Benutzerkonto?</small> Hier registrieren
menu.register.alt=Erstellen Sie Ihr pers\u00F6nliches OpenOLAT-Benutzerkonto
menu.root=OpenOLAT
menu.root.alt=infinite learning
-mail.pwd.subject=Neues Passwort in OpenOLAT
-mail.pwd.body=Das Passwort für Ihren OpenOLAT Account {0} mit der Email {1} wurde soeben von {2} neu gesetzt.\n\n\nWenn Sie mit dieser Änderung nicht einverstanden sind oder denken, dass Ihr Zugang von dritten kompromittiert wurde, dann melden Sie sich bitte unverzüglich beim Support unter {3} oder wählen Sie den Link {4} um das Passwort erneut zu ändern.
+runonce.forced=Bitte t\u00E4tigen Sie alle Angaben und speichern Sie das Formular.
+runonce.title=Wiederkehrende \u00C4nderungen / Einstellungen beim ersten Anmeldevorgang
+shib.redirect=Shibboleth Login
+timeout.message=Ihre Sitzung ist abgelaufen oder der Server wurde neu gestartet. Um sich erneut anzumelden, w\u00E4hlen Sie diesen <b><a href\='reload.html'>Link</a></b> oder laden Sie die Seite neu.<br><br>Bitte beachten Sie, dass alle ungespeicherten \u00C4nderungen in Ihrem Browserfenster beim erneuten Anmelden verloren gehen. Schliessen Sie diesen Dialog um ungespeicherte Forenbeitr\u00E4ge oder \u00E4hnliches jetzt in die Zwischenablage Ihres Browsers zu kopieren und anschliessend die Seite neu zu laden.
+timeout.title=Sitzung abgelaufen
topnav.help=Hilfe
topnav.help.alt=Starten Sie die OpenOLAT-Hilfe
-timeout.title=Sitzung abgelaufen
-timeout.message=Ihre Sitzung ist abgelaufen oder der Server wurde neu gestartet. Um sich erneut anzumelden, wählen Sie diesen <b><a href='reload.html'>Link</a></b> oder laden Sie die Seite neu.<br><br>Bitte beachten Sie, dass alle ungespeicherten Änderungen in Ihrem Browserfenster beim erneuten Anmelden verloren gehen. Schliessen Sie diesen Dialog um ungespeicherte Forenbeiträge oder ähnliches jetzt in die Zwischenablage Ihres Browsers zu kopieren und anschliessend die Seite neu zu laden.
wayf.homesite=Hochschule
wayf.intro=Bitte w\u00E4hlen Sie Ihre Hochschule. <br>F\u00FCr die Authentifizierung werden Sie weitergeleitet.
wayf.pleasechoose=Bitte w\u00E4hlen Sie Ihre Hochschule...
wayf.submit=Login
-default.shib.intro=Sie werden zur Authentifizierung weitergeleitet.
-shib.redirect=Shibboleth Login
-runonce.forced=Bitte tätigen Sie alle Angaben und speichern Sie das Formular.
-runonce.title=Wiederkehrende Änderungen / Einstellungen beim ersten Anmeldevorgang
-loadtest.warn=Achtung! Loadtestmode ist eingeschaltet!
\ No newline at end of file
diff --git a/src/main/java/org/olat/login/_i18n/LocalStrings_el.properties b/src/main/java/org/olat/login/_i18n/LocalStrings_el.properties
index 71ac3a9628b..5c48896a30a 100644
--- a/src/main/java/org/olat/login/_i18n/LocalStrings_el.properties
+++ b/src/main/java/org/olat/login/_i18n/LocalStrings_el.properties
@@ -1,4 +1,4 @@
-#Thu Sep 03 11:24:42 CEST 2015
+#Wed Nov 04 22:07:24 CET 2015
about.linktext=\u03A0\u03B5\u03C1\u03B9\u03C3\u03C3\u03CC\u03C4\u03B5\u03C1\u03B5\u03C2 \u03C0\u03BB\u03B7\u03C1\u03BF\u03C6\u03BF\u03C1\u03AF\u03B5\u03C2 \u03BA\u03B1\u03B8\u03CE\u03C2 \u03BA\u03B1\u03B9 mailing lists \u03B5\u03AF\u03BD\u03B1\u03B9 \u03B4\u03B9\u03B1\u03B8\u03AD\u03C3\u03B9\u03BC\u03B5\u03C2 \u03C3\u03C4\u03BF <a class\="o_link_extern" href\="http\://www.openolat.org" target\="_blank">www.openolat.org</a>
about.title=\u03A3\u03C7\u03B5\u03C4\u03B9\u03BA\u03AC \u03BC\u03B5 \u03C4\u03BF OpenOLAT
about.translate=\u03A0\u03BF\u03BB\u03C5\u03B3\u03BB\u03C9\u03C3\u03C3\u03B9\u03BA\u03AE \u03C3\u03C5\u03BD\u03B5\u03B9\u03C3\u03C6\u03BF\u03C1\u03AC
@@ -78,8 +78,6 @@ login.intro=\u03A0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03BF\u03CD\u03BC\u03B5 \
login.notavailable=\u03A5\u03C0\u03B5\u03C1\u03C6\u03CC\u03C1\u03C4\u03C9\u03C3\u03B7 \u03B5\u03BE\u03C5\u03C0\u03B7\u03C1\u03B5\u03C4\u03B7\u03C4\u03AE. \u03A0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03CE \u03C0\u03C1\u03BF\u03C3\u03C0\u03B1\u03B8\u03AE\u03C3\u03C4\u03B5 \u03B1\u03C1\u03B3\u03CC\u03C4\u03B5\u03C1\u03B1.
menu.about=\u03A3\u03C7\u03B5\u03C4\u03B9\u03BA\u03AC \u03BC\u03B5 \u03C4\u03BF OpenOLAT
menu.about.alt=\u03A0\u03BB\u03B7\u03C1\u03BF\u03C6\u03BF\u03C1\u03AF\u03B5\u03C2 \u03B3\u03B9\u03B1 \u03C4\u03BF OpenOLAT
-menu.check=\u0388\u03BB\u03B5\u03B3\u03C7\u03BF\u03C2 \u03C6\u03C5\u03BB\u03BB\u03BF\u03BC\u03B5\u03C4\u03C1\u03B7\u03C4\u03AE (browser)
-menu.check.alt=\u0395\u03BB\u03AD\u03B3\u03BE\u03C4\u03B5 \u03B5\u03AC\u03BD \u03BF browser \u03B5\u03AF\u03BD\u03B1\u03B9 \u03C3\u03C9\u03C3\u03C4\u03AC \u03C1\u03C5\u03B8\u03BC\u03B9\u03C3\u03BC\u03AD\u03BD\u03BF\u03C2
menu.guest=\u03A0\u03C1\u03CC\u03C3\u03B2\u03B1\u03C3\u03B7 \u03C9\u03C2 \u03B5\u03C0\u03B9\u03C3\u03BA\u03AD\u03C0\u03C4\u03B7\u03C2
menu.guest.alt=\u0395\u03AF\u03C3\u03BF\u03B4\u03BF\u03C2 \u03C9\u03C2 \u03B5\u03C0\u03B9\u03C3\u03BA\u03AD\u03C0\u03C4\u03B7\u03C2
menu.login=\u0395\u03AF\u03C3\u03BF\u03B4\u03BF\u03C2
diff --git a/src/main/java/org/olat/login/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/login/_i18n/LocalStrings_en.properties
index ed2c836517a..1f4b97a619e 100644
--- a/src/main/java/org/olat/login/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/login/_i18n/LocalStrings_en.properties
@@ -1,27 +1,19 @@
-#Wed Jan 25 11:51:48 CET 2012
+#Wed Nov 04 22:07:24 CET 2015
about.copyright=Copyright and contributions
+about.custom=
+about.custom.title=
about.date=Zurich, February 8, 2011
+about.elearningjournal.test.2015=The eLearning-Journal ranked the LMS OpenOLAT with the label "very good" in a extensive comparison and tests of LMS available on the market. With this great result OpenOLAT is rated as a best practice solution. As a speciality of OpenOLAT the great number of features and tools available in OpenOLAT has been named.
about.financing=Financing the development
-about.financing.intro=The open source system OpenOLAT is developed and financed by <a href="http://www.frentix.com" target="_blank"><i class="o_icon o_icon_link_extern"> </i> frentix GmbH</a> together with its OpenOLAT partners. Also you can contribute to the development of OpenOLAT by supporting our efforts with a donation.
+about.financing.intro=The open source system OpenOLAT is developed and financed by <a href\="http\://www.frentix.com" target\="_blank"><i class\="o_icon o_icon_link_extern"> </i> frentix GmbH</a> together with its OpenOLAT partners. Also you can contribute to the development of OpenOLAT by supporting our efforts with a donation.
about.history=The Learning Management System OpenOLAT is being developed by the OpenOLAT community since 2011. OpenOLAT is a fork of the open source LMS OLAT developed by University of Zurich and is used world-wide by educational institutions and other enterprises. OpenOLAT is open-source and can be used and modified for free.
-about.linktext=More information as well as mailing lists are available at <a href\="http\://www.openolat.org" target\="_blank"><i class="o_icon o_icon_link_extern"> </i> www.openolat.org</a>
-
-
-
-
-
-
-
-about.elearningjournal.test.2015=The eLearning-Journal ranked the LMS OpenOLAT with the label "very good" in a extensive comparison and tests of LMS available on the market. With this great result OpenOLAT is rated as a best practice solution. As a speciality of OpenOLAT the great number of features and tools available in OpenOLAT has been named.
+about.linktext=More information as well as mailing lists are available at <a href\="http\://www.openolat.org" target\="_blank"><i class\="o_icon o_icon_link_extern"> </i> www.openolat.org</a>
+about.partner=OpenOLAT partner
+about.partner.intro=The following institutions are members of the <a href\="http\://www.openolat.com/open-source-lms/partnerprogramm/" target\="_blank">OpenOLAT partership programm</a> and are actively spporting the development of the LMS OpenOLAT\:
+about.social=Connect with us on social networks\:
about.title=About OpenOLAT
about.translate=Multilingual
about.version=Version
-about.custom.title=
-about.custom=
-about.partner=OpenOLAT partner
-about.partner.intro=The following institutions are members of the <a href="http://www.openolat.com/open-source-lms/partnerprogramm/" target="_blank">OpenOLAT partership programm</a> and are actively spporting the development of the LMS OpenOLAT\:
-about.social=Connect with us on social networks\:
-
accessibility.accesskeys=By using shortcuts it is possible to jump to the most important elements within the system.
accessibility.accesskeys.browsers=How to activate shortcuts in different browsers.
accessibility.accesskeys1=Depending on browser and operating system short cuts are made using the CTRL, ALT, or Shift key (or a combination thereof).
@@ -33,14 +25,9 @@ accessibility.fontsize.change=You can also adjust your standard font size in Ope
accessibility.fontsize.title=Font sizes
accessibility.intro=OpenOLAT is optimized to support accessibility to visually impaired people
accessibility.title=OpenOLAT and accessibility
-
-
-
-
-
accesskey.back=$org.olat.core.commons.fullWebApp\:accesskey.back
-accesskey.content=$org.olat.core.commons.fullWebApp\:accesskey.content
accesskey.changes=$org.olat.core.commons.fullWebApp\:accesskey.changes
+accesskey.content=$org.olat.core.commons.fullWebApp\:accesskey.content
accesskey.menu=$org.olat.core.commons.fullWebApp\:accesskey.menu
accesskey.modal=$org.olat.core.commons.fullWebApp\:accesskey.modal
accesskey.nav=$org.olat.core.commons.fullWebApp\:accesskey.nav
@@ -51,7 +38,6 @@ accesskey.title=$org.olat.core.commons.fullWebApp\:accesskey.title
accesskey.tools=$org.olat.core.commons.fullWebApp\:accesskey.tools
accesskey.top=$org.olat.core.commons.fullWebApp\:accesskey.top
accesskey.topnav=$org.olat.core.commons.fullWebApp\:accesskey.topnav
-
admin.menu.title=Guest and invitation
admin.menu.title.alt=$\:admin.menu.title
authentication.provider.description=Don't you belong to one of the institutions mentioned above or have a local user acount?
@@ -74,8 +60,8 @@ browsercheck.osx=With MacOSX you should use Safari or Firefox.
browsercheck.others.IE6=Internet Explorer 6 by Microsoft is not fully supported anymore. Read more about this here\:
browsercheck.others.others=Generally OpenOLAT can also be used with other browsers like mobile Safari for iPhone/iPad or Opera. For administrators and authors it is nevertheless recommended to use one of the above mentioned browsers.
browsercheck.others.title=Other browsers
-browsercheck.title=Supported browsers
browsercheck.since=from version
+browsercheck.title=Supported browsers
browsercheck.yes=Yes
browsercheck.yourbrowser.codename=Browser code name\:
browsercheck.yourbrowser.cookies=Cookies accepted\:
@@ -86,7 +72,10 @@ browsercheck.yourbrowser.name=Browser\:
browsercheck.yourbrowser.os=Operating system\:
browsercheck.yourbrowser.title=You are using the following browser\:
browsercheck.yourbrowser.usragent=User agent\:
+chelp.about.title=About OpenOLAT
chelp.about1=Here you will get information on licence conditions when using OpenOLAT.
+chelp.accessibility.title=Accessibility
+chelp.browsercheck.title=Browser check
chelp.check1=Please make sure that your browser is set in a way that OpenOLAT's functionality can be used properly.
chelp.dmz.title=Access to OpenOLAT
chelp.forg1=Click here to get help if you have forgotten your passwort.
@@ -95,10 +84,11 @@ chelp.guest2=As guest you will only dispose of limited functionality.
chelp.log1=First select your university on the intro page. You will then be passed on and invited to enter your access data.
chelp.log2=Now you can use the full functionality of OpenOLAT.
chelp.log3=If you belong to none of the listed universities, select <i>$\:login.altprovider</i>.
-chelp.about.title=About OpenOLAT
-chelp.accessibility.title=Accessibility
-chelp.browsercheck.title=Browser check
default.shib.intro=You will be redirected to authentication.
+enabled=enabled
+guest.login=Guest login on login page
+guest.login.links=Links for guests
+invitation.login=Allow invitation
lf.error.loginempty=Please enter your user name.
lf.error.passempty=Please insert a password.
lf.login=OpenOLAT user name
@@ -110,26 +100,17 @@ login.blocked=<b>Login blocked for this user name.</b><p><font size\="-1">Too ma
login.blocked.forAll=Login are blocked. Please try later.
login.browserswitch=Your Internet browser does not support all features of OpenOLAT. For best results we recommend <a href\="http\://www.mozilla.org/en/firefox">Mozilla Firefox 12 (or newer version).</a> or Internet Explorer 9 (or a newer version).
login.button=Login
-login.error=User name or password wrong. Please try again or use the function "$:menu.pw".
+login.customfootermsg=
+login.custommsg=
+login.error=User name or password wrong. Please try again or use the function "$\:menu.pw".
login.form=OpenOLAT login
login.header=OpenOLAT - infinite learning
login.intro=Please log in with your personal OpenOLAT user name and password.
login.notavailable=Server overload. Please try again later.
-login.custommsg=
-
-login.customfootermsg=
-
-guest.login=Guest login on login page
-guest.login.links=Links for guests
-invitation.login=Allow invitation
-enabled=enabled
-
-mail.pwd.subject=Password changed
mail.pwd.body=The password for your OpenOLAT account {0} with the email address {1} has been changed by {2}.\n\n\nIf you do not agree with this change or if you think your account has been compromised by third parties, please contact support immediately at {3} or use the Link {4} to change the password again.
+mail.pwd.subject=Password changed
menu.about=About OpenOLAT
menu.about.alt=Information on OpenOLAT
-menu.check=Browser check
-menu.check.alt=Check if your browser is properly configured
menu.guest=Guest access
menu.guest.alt=Log in as guest
menu.login=Login
@@ -142,10 +123,10 @@ menu.root.alt=infinite learning
runonce.forced=Please fill in this form and save your settings.
runonce.title=Recurring modifications/settings when logging in the first time
shib.redirect=Shibboleth Login
+timeout.message=Your session has been timed out or the server has been restarted. To login again please use this <b><a href\='reload.html'>link</a></b> or reload the page.<br><br>Be aware that all unsaved changes in your browser window will be lost during the login process. Close this dialog to manually copy unsaved content such as forum postings to the browser clip board and to manually reload the page.
+timeout.title=Session timeout
topnav.help=Help
topnav.help.alt=Start OpenOLAT Help
-timeout.title=Session timeout
-timeout.message=Your session has been timed out or the server has been restarted. To login again please use this <b><a href='reload.html'>link</a></b> or reload the page.<br><br>Be aware that all unsaved changes in your browser window will be lost during the login process. Close this dialog to manually copy unsaved content such as forum postings to the browser clip board and to manually reload the page.
wayf.homesite=University
wayf.intro=Please select your university.<br><br>You will be redirected for authentication.
wayf.pleasechoose=Please select your university...
diff --git a/src/main/java/org/olat/login/_i18n/LocalStrings_es.properties b/src/main/java/org/olat/login/_i18n/LocalStrings_es.properties
index 45db05ee081..80fddd87263 100644
--- a/src/main/java/org/olat/login/_i18n/LocalStrings_es.properties
+++ b/src/main/java/org/olat/login/_i18n/LocalStrings_es.properties
@@ -1,4 +1,4 @@
-#Thu Sep 03 11:24:42 CEST 2015
+#Wed Nov 04 22:07:24 CET 2015
about.linktext=M\u00E1s informaci\u00F3n as\u00ED como la lista de correo est\u00E1 disponible en <a href\="http\://www.openolat.org" target\="_blank"><i class\="o_icon o_icon_link_extern"> </i> www.openolat.org</a>
about.title=Sobre OpenOLAT
about.translate=Multiling\u00FCe
@@ -74,8 +74,6 @@ login.intro=Por favor inicia la sesi\u00F3n con tu nombre de usuario y contrase\
login.notavailable=El servidor se encuentra sobrecargado. Por favor, intente m\u00E1s tarde.
menu.about=Sobre OpenOLAT
menu.about.alt=Informaci\u00F3n sobre OpenOLAT
-menu.check=Comprobaci\u00F3n de navegador
-menu.check.alt=Comprueba si tu navegador est\u00E1 correctamente configurado
menu.guest=Acceso invitado
menu.guest.alt=Acceder como invitado
menu.login=Login
diff --git a/src/main/java/org/olat/login/_i18n/LocalStrings_fa.properties b/src/main/java/org/olat/login/_i18n/LocalStrings_fa.properties
index 450dd4df658..3942192807a 100644
--- a/src/main/java/org/olat/login/_i18n/LocalStrings_fa.properties
+++ b/src/main/java/org/olat/login/_i18n/LocalStrings_fa.properties
@@ -1,4 +1,4 @@
-#Thu Sep 03 11:24:43 CEST 2015
+#Wed Nov 04 22:07:24 CET 2015
about.linktext=More information as well as mailing lists are available at <a href\="http\://www.openolat.org" target\="_blank"><i class\="o_icon o_icon_link_extern"> </i> www.openolat.org</a>
about.title=\u062F\u0631\u0628\u0627\u0631\u0647 \u0633\u06CC\u0633\u062A\u0645
about.translate=Multilingual
@@ -53,8 +53,6 @@ login.header=OpenOLAT - infinite learning
login.intro=\u0644\u0637\u0641\u0627 \u0628\u0627 \u0646\u0627\u0645 \u06A9\u0627\u0631\u0628\u0631\u06CC \u0648 \u06A9\u0644\u0645\u0647 \u0639\u0628\u0648\u0631 \u0645\u062E\u0635\u0648\u0635 \u0628\u0647 \u062E\u0648\u062F \u0648\u0627\u0631\u062F \u0634\u0648\u06CC\u062F
menu.about=\u062F\u0631\u0628\u0627\u0631\u0647 \u0633\u06CC\u0633\u062A\u0645
menu.about.alt=\u0627\u0637\u0644\u0627\u0639\u0627\u062A\u06CC \u062F\u0631\u0628\u0627\u0631\u0647 \u0633\u06CC\u0633\u062A\u0645
-menu.check=\u0628\u0631\u0631\u0633\u06CC \u0645\u0631\u0648\u0631\u06AF\u0631 \u0648\u0628
-menu.check.alt=\u0628\u0631\u0631\u0633\u06CC \u062F\u0631\u0633\u062A\u06CC \u067E\u06CC\u06A9\u0631 \u0628\u0646\u062F\u06CC \u0645\u0631\u0648\u0631 \u06AF\u0631 \u0634\u0645\u0627
menu.guest=\u06A9\u0627\u0631\u0628\u0631 \u0645\u0647\u0645\u0627\u0646
menu.guest.alt=\u0628\u0647 \u0639\u0646\u0648\u0627\u0646 \u0645\u0647\u0645\u0627\u0646 \u0648\u0627\u0631\u062F \u0634\u0648\u06CC\u062F
menu.login=\u0648\u0631\u0648\u062F
diff --git a/src/main/java/org/olat/login/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/login/_i18n/LocalStrings_fr.properties
index c3c04868689..94c12403b31 100644
--- a/src/main/java/org/olat/login/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/login/_i18n/LocalStrings_fr.properties
@@ -1,4 +1,4 @@
-#Thu Sep 03 11:24:42 CEST 2015
+#Wed Nov 04 22:07:24 CET 2015
about.copyright=Copyright et participations
about.date=Z\u00FCrich, le 8 f\u00E9vrier 2011
about.elearningjournal.test.2015=Le eLearning-Journal a class\u00E9 OpenOLAT avec le titre "tr\u00E8s bien" apr\u00E8s un test et une comparaison approfondie des LMS disponibles sur le march\u00E9. Avec cet excellent r\u00E9sultat, OpenOLAT est consid\u00E9r\u00E9 comme une solution de r\u00E9f\u00E9rence. Une sp\u00E9cialit\u00E9 d'OpenOLAT qui a \u00E9t\u00E9 soulign\u00E9e, est le grand nombre de fonctionnalit\u00E9s et d'outils disponibles.
@@ -106,8 +106,6 @@ mail.pwd.body=Le mot de passe de votre compte OpenOLAT {0} avec l'adresse e-mail
mail.pwd.subject=Mot de passe chang\u00E9
menu.about=A propos d'OpenOLAT
menu.about.alt=Informations sur OpenOLAT
-menu.check=Contr\u00F4le du navigateur
-menu.check.alt=Assurez-vous que votre navigateur est configur\u00E9 correctement
menu.guest=Acc\u00E8s invit\u00E9(e)
menu.guest.alt=Connectez-vous comme invit\u00E9(e)
menu.login=Login
diff --git a/src/main/java/org/olat/login/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/login/_i18n/LocalStrings_it.properties
index 5619f53a9e3..0817c92003b 100644
--- a/src/main/java/org/olat/login/_i18n/LocalStrings_it.properties
+++ b/src/main/java/org/olat/login/_i18n/LocalStrings_it.properties
@@ -1,4 +1,4 @@
-#Thu Sep 03 11:24:42 CEST 2015
+#Wed Nov 04 22:07:24 CET 2015
about.linktext=Ulteriori informazioni e liste e-mail sono disponibili presso <a href\="http\://www.openolat.org" target\="_blank"><i class\="o_icon o_icon_link_extern"> </i> www.openolat.org</a>
about.title=Cos'\u00E8 OpenOLAT?
about.translate=Lingue
@@ -80,8 +80,6 @@ login.intro=Acceda a OpenOLAT con il Suo nome d'utente e la password personale.
login.notavailable=Il server \u00E8 momentaneamente sovraccarico. Provi pi\u00F9 tardi, p.f.
menu.about=OpenOLAT
menu.about.alt=Informazioni su OpenOLAT
-menu.check=Verifica del browser
-menu.check.alt=Si informi sulla corretta configurazione del Suo browser.
menu.guest=Accesso come ospite
menu.guest.alt=Acceda come ospite.
menu.login=Login
diff --git a/src/main/java/org/olat/login/_i18n/LocalStrings_jp.properties b/src/main/java/org/olat/login/_i18n/LocalStrings_jp.properties
index 7a504ca442c..81538bfebb3 100644
--- a/src/main/java/org/olat/login/_i18n/LocalStrings_jp.properties
+++ b/src/main/java/org/olat/login/_i18n/LocalStrings_jp.properties
@@ -1,4 +1,4 @@
-#Thu Sep 03 11:24:42 CEST 2015
+#Wed Nov 04 22:07:24 CET 2015
about.linktext=\u30E1\u30FC\u30EA\u30F3\u30B0\u30EA\u30B9\u30C8\u304A\u3088\u3073\u3055\u3089\u306A\u308B\u60C5\u5831\u306F\u3001<a href\="http\://www.openolat.org" target\="_blank"><i class\="o_icon o_icon_link_extern"> </i> www.openolat.org</a>\u3067\u5229\u7528\u53EF\u80FD\u3067\u3059\u3002
about.title=OpenOLAT\u306B\u3064\u3044\u3066
about.translate=\u591A\u8A00\u8A9E
@@ -60,7 +60,6 @@ login.form=OpenOLAT\u30ED\u30B0\u30A4\u30F3
login.intro=\u3042\u306A\u305F\u306EOpenOLAT\u30E6\u30FC\u30B6\u540D\u304A\u3088\u3073\u30D1\u30B9\u30EF\u30FC\u30C9\u3067\u30ED\u30B0\u30A4\u30F3\u3057\u3066\u304F\u3060\u3055\u3044\u3002
login.notavailable=\u30B5\u30FC\u30D0\u306E\u30AA\u30FC\u30D0\u30FC\u30ED\u30FC\u30C9\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u5F8C\u307B\u3069\u3001\u304A\u8A66\u3057\u304F\u3060\u3055\u3044\u3002
menu.about=OpenOLAT\u306B\u3064\u3044\u3066
-menu.check=\u30D6\u30E9\u30A6\u30B6\u30C1\u30A7\u30C3\u30AF
menu.guest=\u30B2\u30B9\u30C8\u30A2\u30AF\u30BB\u30B9
menu.guest.alt=\u30B2\u30B9\u30C8\u3068\u3057\u3066\u30ED\u30B0\u30A4\u30F3\u3059\u308B
menu.login=\u30ED\u30B0\u30A4\u30F3
diff --git a/src/main/java/org/olat/login/_i18n/LocalStrings_lt.properties b/src/main/java/org/olat/login/_i18n/LocalStrings_lt.properties
index b7231fd4139..06491bc9bb2 100644
--- a/src/main/java/org/olat/login/_i18n/LocalStrings_lt.properties
+++ b/src/main/java/org/olat/login/_i18n/LocalStrings_lt.properties
@@ -1,4 +1,4 @@
-#Thu Sep 03 11:24:42 CEST 2015
+#Wed Nov 04 22:07:24 CET 2015
about.linktext=Daugiau informacijos rasite\: <a href\="http\://www.openolat.org" target\="_blank"><i class\="o_icon o_icon_link_extern"> </i> www.openolat.org</a>
about.title=Apie E. para\u0161o mokymo sistem\u0105
about.translate=Daugiakalb\u0117
@@ -62,8 +62,6 @@ login.header=OpenOLAT - infinite learning
login.intro=<p align\="center"><b>NUOTOLINIO MOKYMO SISTEMA</b></p>
menu.about=Apie E. para\u0161o mokymo sistem\u0105
menu.about.alt=Informacija apie mokymo sistema
-menu.check=Nar\u0161ykl\u0117s patikrinimas
-menu.check.alt=Patikrinkite ar j\u016Bs\u0173 nar\u0161ykl\u0117 tinkamai nustatyta
menu.guest.alt=Prisijungti sve\u010Dio teis\u0117mis
menu.login=Prisijungti
menu.login.alt=Prisijungti prie nuolotinio mokymo valdymo sistemos
diff --git a/src/main/java/org/olat/login/_i18n/LocalStrings_nl_NL.properties b/src/main/java/org/olat/login/_i18n/LocalStrings_nl_NL.properties
index dcc52125496..ac2d09c9e2c 100644
--- a/src/main/java/org/olat/login/_i18n/LocalStrings_nl_NL.properties
+++ b/src/main/java/org/olat/login/_i18n/LocalStrings_nl_NL.properties
@@ -1,4 +1,4 @@
-#Thu Sep 03 11:24:44 CEST 2015
+#Wed Nov 04 22:07:24 CET 2015
about.linktext=Meer informatie zowel als maillijsten zijn beschikbaar op <a href\="http\://www.openolat.org" target\="_blank"><i class\="o_icon o_icon_link_extern"> </i> www.openolat.org</a>
about.title=Over OpenOLAT
about.translate=Multilinguaal
@@ -79,8 +79,6 @@ login.intro=Gelieve u aan te melden met uw persoonlijke OpenOLAT gebruikersnaam
login.notavailable=De server is overbelast. Gelieve het later opnieuw te proberen.
menu.about=Over OpenOLAT
menu.about.alt=Informatie over OpenOLAT
-menu.check=Browser check
-menu.check.alt=Kijk na of uw browser op de correcte manier geconfigureerd is
menu.guest=Gasttoegang
menu.guest.alt=Inloggen als gast
menu.login=Log-in
diff --git a/src/main/java/org/olat/login/_i18n/LocalStrings_pl.properties b/src/main/java/org/olat/login/_i18n/LocalStrings_pl.properties
index c40e550261f..25d71df0fbc 100644
--- a/src/main/java/org/olat/login/_i18n/LocalStrings_pl.properties
+++ b/src/main/java/org/olat/login/_i18n/LocalStrings_pl.properties
@@ -1,4 +1,4 @@
-#Thu Sep 03 11:24:43 CEST 2015
+#Wed Nov 04 22:07:24 CET 2015
about.linktext=Wi\u0119cej informacji i listy mailingowe s\u0105 dost\u0119pne pod adresem <a class\="o_link_extern" href\="http\://www.openolat.org" target\="_blank">www.openolat.org</a>
about.title=Na temat OpenOLAT
about.translate=Wieloj\u0119zykowo\u015B\u0107
@@ -78,8 +78,6 @@ login.intro=Zaloguj si\u0119 z u\u017Cyciem swojej nazwy u\u017Cytkownika i has\
login.notavailable=Serwer jest przeci\u0105\u017Cony. Spr\u00F3buj ponownie p\u00F3\u017Aniej.
menu.about=O OpenOLAT
menu.about.alt=Informacje o OpenOLAT
-menu.check=Informacje o przegl\u0105darce
-menu.check.alt=Sprawd\u017A czy twoja przegl\u0105darka jest odpowiednio skonfigurowana
menu.guest=Dost\u0119p jako go\u015B\u0107
menu.guest.alt=Zaloguj si\u0119 jako go\u015B\u0107
menu.login=Loguj
diff --git a/src/main/java/org/olat/login/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/login/_i18n/LocalStrings_pt_BR.properties
index a31eaab0a20..c79291ff4dd 100644
--- a/src/main/java/org/olat/login/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/login/_i18n/LocalStrings_pt_BR.properties
@@ -1,4 +1,4 @@
-#Thu Sep 03 11:24:42 CEST 2015
+#Wed Nov 04 22:07:24 CET 2015
about.copyright=Copyright e contribui\u00E7\u00F5es
about.date=Zurique, 8 de Fevereiro de 2011
about.elearningjournal.test.2015=O eLearning-Journal classificou o LMS OpenOLAT com o resultado "muito bom" em uma compara\u00E7\u00E3o extensa e em testes de LMS dispon\u00EDveis no mercado. Com este grande resultado, o OpenOLAT \u00E9 avaliado como a melhor solu\u00E7\u00E3o. Como grande destaque, o OpenOLAT foi nomeado devido ao grande n\u00FAmero de recursos e ferramentas dispon\u00EDveis.
@@ -104,8 +104,6 @@ mail.pwd.body=A senha para a sua conta OpenOLAT {0} com o endere\u00E7o de e-mai
mail.pwd.subject=Senha alterada
menu.about=Sobre o OpenOLAT
menu.about.alt=Informa\u00E7\u00E3o sobre o OpenOLAT
-menu.check=Verifica\u00E7\u00E3o do Browser
-menu.check.alt=Verificar se seu browser est\u00E1 configurado corretamente
menu.guest=Acesso ao Convidado
menu.guest.alt=Entrar como Convidado
menu.login=Entrar
diff --git a/src/main/java/org/olat/login/_i18n/LocalStrings_pt_PT.properties b/src/main/java/org/olat/login/_i18n/LocalStrings_pt_PT.properties
index 5fa77f5df92..9584db9e5dc 100644
--- a/src/main/java/org/olat/login/_i18n/LocalStrings_pt_PT.properties
+++ b/src/main/java/org/olat/login/_i18n/LocalStrings_pt_PT.properties
@@ -1,4 +1,4 @@
-#Thu Sep 03 11:24:44 CEST 2015
+#Wed Nov 04 22:07:24 CET 2015
about.linktext=Mais informa\u00E7\u00F5es assim como listas de envio est\u00E3o dispon\u00EDveis em <a href\="http\://www.openolat.org" target\="_blank"><i class\="o_icon o_icon_link_extern"> </i> www.openolat.org</a>
about.title=Sobre o OpenOLAT
about.translate=Multilingual
@@ -64,8 +64,6 @@ login.header=OpenOLAT - infinite learning
login.intro=Favor entrar com sua identifica\u00E7\u00E3o pessoal do OpenOLAT.
menu.about=Sobre o OpenOLAT
menu.about.alt=Informa\u00E7\u00E3o sobre o OpenOLAT
-menu.check=Verifica\u00E7\u00E3o do Browser
-menu.check.alt=Verificar se seu browser est\u00E1 configurado corretamente
menu.guest=Acesso ao Convidado
menu.guest.alt=Entrar como Convidado
menu.login=Entrar
diff --git a/src/main/java/org/olat/login/_i18n/LocalStrings_ru.properties b/src/main/java/org/olat/login/_i18n/LocalStrings_ru.properties
index 7ee581922ff..d30ed66ce36 100644
--- a/src/main/java/org/olat/login/_i18n/LocalStrings_ru.properties
+++ b/src/main/java/org/olat/login/_i18n/LocalStrings_ru.properties
@@ -1,4 +1,4 @@
-#Thu Sep 03 11:24:41 CEST 2015
+#Wed Nov 04 22:07:24 CET 2015
about.linktext=\u0414\u043E\u043F\u043E\u043B\u043D\u0438\u0442\u0435\u043B\u044C\u043D\u0443\u044E \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044E \u0438 \u0430\u0434\u0440\u0435\u0441\u0430 \u044D\u043B\u0435\u043A\u0442\u0440\u043E\u043D\u043D\u043E\u0439 \u043F\u043E\u0447\u0442\u044B \u0412\u044B \u043C\u043E\u0436\u0435\u0442\u0435 \u043D\u0430\u0439\u0442\u0438 \u043D\u0430 <a href\="http\://www.openolat.org" target\="_blank"><i class\="o_icon o_icon_link_extern"> </i> www.openolat.org</a>
about.title=\u041E\u0431 OLAT
about.translate=\u041C\u043D\u043E\u0433\u043E\u044F\u0437\u044B\u0447\u043D\u043E\u0441\u0442\u044C
@@ -74,8 +74,6 @@ login.intro=\u041F\u043E\u0436\u0430\u0439\u043B\u0443\u0441\u0442\u0430, \u0432
login.notavailable=\u0412 \u043D\u0430\u0441\u0442\u043E\u044F\u0449\u0435\u0435 \u0432\u0440\u0435\u043C\u044F \u0441\u0435\u0440\u0432\u0435\u0440 \u043F\u0435\u0440\u0435\u0433\u0440\u0443\u0436\u0435\u043D. \u041F\u043E\u0436\u0430\u0439\u043B\u0443\u0441\u0442\u0430, \u043F\u043E\u043F\u0440\u043E\u0431\u0443\u0439\u0442\u0435 \u043F\u043E\u0437\u0436\u0435 \u0435\u0449\u0451 \u0440\u0430\u0437.
menu.about=\u041E\u0431 OLAT
menu.about.alt=\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F \u043E \u0441\u0438\u0441\u0442\u0435\u043C\u0435 OLAT
-menu.check=\u041F\u0440\u043E\u0432\u0435\u0440\u043A\u0430 \u0431\u0440\u0430\u0443\u0437\u0435\u0440\u0430
-menu.check.alt=\u041F\u0440\u043E\u0432\u0435\u0440\u044C\u0442\u0435, \u043F\u0440\u0430\u0432\u0438\u043B\u044C\u043D\u043E \u043B\u0438 \u043D\u0430\u0441\u0442\u0440\u043E\u0435\u043D \u0412\u0430\u0448 \u0431\u0440\u0430\u0443\u0437\u0435\u0440
menu.guest=\u0413\u043E\u0441\u0442\u044C
menu.guest.alt=\u0412\u043E\u0439\u0442\u0438 \u0432 \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u0435 \u0433\u043E\u0441\u0442\u044F
menu.login=\u0412\u0445\u043E\u0434
diff --git a/src/main/java/org/olat/login/_i18n/LocalStrings_sq.properties b/src/main/java/org/olat/login/_i18n/LocalStrings_sq.properties
index 68c29a6646f..0d8ffd9f16d 100644
--- a/src/main/java/org/olat/login/_i18n/LocalStrings_sq.properties
+++ b/src/main/java/org/olat/login/_i18n/LocalStrings_sq.properties
@@ -1,17 +1,11 @@
-#Wed Jul 28 13:33:32 CEST 2010
-
-
-
-
-
-about.linktext=P\u00EBr m\u00EB tep\u00EBr informata si dhe lista t\u00EB postimeve jan\u00EB t\u00EB gatshme n\u00EB <a href\="http\://www.openolat.org" target\="_blank"><i class="o_icon o_icon_link_extern"> </i> www.openolat.org</a>
-
+#Wed Nov 04 22:07:24 CET 2015
+about.linktext=P\u00EBr m\u00EB tep\u00EBr informata si dhe lista t\u00EB postimeve jan\u00EB t\u00EB gatshme n\u00EB <a href\="http\://www.openolat.org" target\="_blank"><i class\="o_icon o_icon_link_extern"> </i> www.openolat.org</a>
about.title=Mbi OpenOLAT-in
about.translate=Shum\u00EB gjuh\u00EBs
about.version=Versioni
accesskey.back=$org.olat.core.commons.fullWebApp\:accesskey.back
-accesskey.content=$org.olat.core.commons.fullWebApp\:accesskey.content
accesskey.changes=$org.olat.core.commons.fullWebApp\:accesskey.changes
+accesskey.content=$org.olat.core.commons.fullWebApp\:accesskey.content
accesskey.menu=$org.olat.core.commons.fullWebApp\:accesskey.menu
accesskey.modal=$org.olat.core.commons.fullWebApp\:accesskey.modal
accesskey.nav=$org.olat.core.commons.fullWebApp\:accesskey.nav
@@ -22,7 +16,6 @@ accesskey.title=$org.olat.core.commons.fullWebApp\:accesskey.title
accesskey.tools=$org.olat.core.commons.fullWebApp\:accesskey.tools
accesskey.top=$org.olat.core.commons.fullWebApp\:accesskey.top
accesskey.topnav=$org.olat.core.commons.fullWebApp\:accesskey.topnav
-
browsercheck.bestresults.newerversion=ose versione m\u00EB t\u00EB vonshme
browsercheck.bestresults.recommended=(t\u00EB rekomanduara)
browsercheck.bestresults.title=P\u00EBr rezultate m\u00EB t\u00EB mira p\u00EBrdor nj\u00EBrin nga shfletuesit n\u00EB vijim\:
@@ -58,12 +51,8 @@ login.button=Ky\u00E7u
login.error=<OpenOLAT emri i shfryt\u00EBzuesit ose fjal\u00EBkalim i pavlefsh\u00EBm.</b><p>Arsye t\u00EB mundshme mund t\u00EB jen\u00EB\:<ul><li><b>Keni shkruar gabim\:</b><br>Ju lutemi provoni p\u00EBrs\u00EBri\!<li><b>Emri i shfryt\u00EBzuesit ose fjal\u00EBkalimi gabim\:</b><br>N\u00EBse kjo \u00EBsht\u00EB hera e p\u00EBar q\u00EB ju punoni me OpenOLAT at\u00EBher\u00EB ju ose ju duhet t\u00EB kontaktoni me universitetin tuaj ose kontakto {0} p\u00EBr t\u00EB pasur t\u00EB drejt\u00EB kyqje.</ul></p>
login.header=OpenOLAT - infinite learning
login.intro=Ju lutemi ky\u00E7uni me an\u00EB t\u00EB OpenOLAT emrit tuaj t\u00EB shfryt\u00EBzuesit personal
-
-
menu.about=Mbi OpenOLAT-in
menu.about.alt=Informata mbi OpenOLAT-in
-menu.check=Kontrollo shfletuesin
-menu.check.alt=Kontrollo n\u00EBse shfletuesi i juaj \u00EBsht\u00EB i konfiguruar si duhet
menu.guest=Qasja si mysafir
menu.guest.alt=Ky\u00E7u si mysafir
menu.login=Ky\u00E7u
diff --git a/src/main/java/org/olat/login/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/login/_i18n/LocalStrings_zh_CN.properties
index 70dc83e191a..3b5417a12b0 100644
--- a/src/main/java/org/olat/login/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/login/_i18n/LocalStrings_zh_CN.properties
@@ -1,4 +1,4 @@
-#Thu Sep 03 11:24:43 CEST 2015
+#Wed Nov 04 22:07:24 CET 2015
about.linktext=\u60A8\u53EF\u4EE5\u5728<a href\="http\://www.openolat.org" target\="_blank"><i class\="o_icon o_icon_link_extern"> </i> www.openolat.org</a>\u83B7\u5F97\u66F4\u591A\u4FE1\u606F\u6216\u90AE\u4EF6\u8868
about.title=\u5173\u4E8EOLAT
about.translate=\u591A\u56FD\u8BED\u8A00
@@ -74,8 +74,6 @@ login.intro=\u8BF7\u8F93\u5165\u4F60\u7684OLAT\u7528\u6237\u540D\u548C\u5BC6\u78
login.notavailable=\u670D\u52A1\u5668\u8D85\u65F6\u3002\u8BF7\u7A0D\u540E\u91CD\u8BD5\uFF01
menu.about=\u5173\u4E8EOLAT
menu.about.alt=OLAT\u4FE1\u606F
-menu.check=\u6D4F\u89C8\u5668\u68C0\u6D4B
-menu.check.alt=\u68C0\u6D4B\u4F60\u7684\u6D4F\u89C8\u5668\u914D\u7F6E\u60C5\u51B5
menu.guest=\u6E38 \u5BA2
menu.guest.alt=\u4EE5\u6E38\u5BA2\u8EAB\u4EFD\u8FDB\u5165
menu.login=\u767B \u5F55
diff --git a/src/main/java/org/olat/login/_i18n/LocalStrings_zh_TW.properties b/src/main/java/org/olat/login/_i18n/LocalStrings_zh_TW.properties
index 1de63e0d684..5bf51609809 100644
--- a/src/main/java/org/olat/login/_i18n/LocalStrings_zh_TW.properties
+++ b/src/main/java/org/olat/login/_i18n/LocalStrings_zh_TW.properties
@@ -1,4 +1,4 @@
-#Thu Sep 03 11:24:43 CEST 2015
+#Wed Nov 04 22:07:24 CET 2015
about.linktext=\u66F4\u591A\u8CC7\u8A0A\u53CA\u90F5\u4EF6\u6E05\u55AE\u53EF\u4EE5\u5728 <a href\="http\://www.openolat.org" target\="_blank"><i class\="o_icon o_icon_link_extern"> </i> www.openolat.org</a> \u5F97\u5230
about.title=\u95DC\u65BC OpenOLAT
about.translate=\u591A\u570B\u8A9E\u8A00
@@ -74,8 +74,6 @@ login.intro=\u8ACB\u4EE5\u60A8\u500B\u4EBA\u7684 OpenOLAT \u4F7F\u7528\u8005\u54
login.notavailable=\u4F3A\u670D\u5668\u8D85\u904E\u8CA0\u8F09\u3002\u8ACB\u7A0D\u5F8C\u518D\u8A66\u3002
menu.about=\u95DC\u65BC OpenOLAT
menu.about.alt=\u95DC\u65BC OpenOLAT \u7684\u8CC7\u8A0A
-menu.check=\u700F\u89BD\u5668\u6AA2\u67E5
-menu.check.alt=\u6AA2\u67E5\u60A8\u7684\u700F\u89BD\u5668\u662F\u5426\u5DF2\u6B63\u78BA\u5730\u8A2D\u5B9A\u4E86
menu.guest=\u8A2A\u5BA2\u5B58\u53D6
menu.guest.alt=\u4EE5\u8A2A\u5BA2\u8EAB\u4EFD\u767B\u5165
menu.login=\u767B\u5165
diff --git a/src/main/java/org/olat/login/_i18n/i18nBundleMetadata.properties b/src/main/java/org/olat/login/_i18n/i18nBundleMetadata.properties
index 1a6e67908d0..cf7a642729f 100644
--- a/src/main/java/org/olat/login/_i18n/i18nBundleMetadata.properties
+++ b/src/main/java/org/olat/login/_i18n/i18nBundleMetadata.properties
@@ -1,11 +1,7 @@
-#Sun May 17 04:07:57 CEST 2009
-
-authentication.provider.description.annotation=above mentioned
-
-login.custommsg.annotation=Optional message that appears above login form, e.g. some welcome text
-login.customfootermsg.annotation=Optional message that appears below login form, e.g. to place some help links
-
-about.custom.title=Optional title for specific usage scenario
+#Wed Nov 04 22:07:23 CET 2015
about.custom=Optional content for specific usage scenario
-
+about.custom.title=Optional title for specific usage scenario
+authentication.provider.description.annotation=above mentioned
bundle.priority=400
+login.customfootermsg.annotation=Optional message that appears below login form, e.g. to place some help links
+login.custommsg.annotation=Optional message that appears above login form, e.g. some welcome text
diff --git a/src/main/java/org/olat/search/_spring/searchContext.xml b/src/main/java/org/olat/search/_spring/searchContext.xml
index 25161265fad..e4adf9ccadb 100644
--- a/src/main/java/org/olat/search/_spring/searchContext.xml
+++ b/src/main/java/org/olat/search/_spring/searchContext.xml
@@ -154,7 +154,6 @@
<list>
<ref bean="groupIndexer" />
<ref bean="repositoryIndexer" />
- <ref bean="helpIndexer" />
<ref bean="identityIndexer" />
<ref bean="epDefaultMapIndexer" />
<ref bean="epStructuredMapIndexer" />
@@ -162,8 +161,6 @@
</property>
</bean>
- <bean id="helpIndexer" class="org.olat.search.service.indexer.ContextHelpIndexer" />
-
<!-- Repository -->
<bean id="repositoryIndexer" class="org.olat.search.service.indexer.repository.RepositoryIndexer">
<property name="repositoryManager" ref="repositoryManager" />
diff --git a/src/main/java/org/olat/search/service/document/ContextHelpDocument.java b/src/main/java/org/olat/search/service/document/ContextHelpDocument.java
deleted file mode 100644
index 8b6180c8349..00000000000
--- a/src/main/java/org/olat/search/service/document/ContextHelpDocument.java
+++ /dev/null
@@ -1,115 +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.search.service.document;
-
-import java.io.StringWriter;
-import java.util.Date;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.lucene.document.Document;
-import org.apache.velocity.context.Context;
-import org.olat.core.commons.contextHelp.ContextHelpDispatcher;
-import org.olat.core.gui.render.velocity.VelocityHelper;
-import org.olat.core.gui.translator.Translator;
-import org.olat.core.logging.OLog;
-import org.olat.core.logging.Tracing;
-import org.olat.core.util.i18n.I18nManager;
-import org.olat.core.util.i18n.I18nModule;
-import org.olat.search.model.OlatDocument;
-import org.olat.search.service.SearchResourceContext;
-
-/**
- * Description:<br>
- * The context help document indexes a context sensitive help page
- *
- * <P>
- * Initial Date: 05.11.2008 <br>
- * @author gnaegi
- */
-public class ContextHelpDocument extends OlatDocument {
-
- private static final long serialVersionUID = 599794530742910533L;
- private static final OLog log = Tracing.createLoggerFor(ContextHelpDocument.class);
- private static final Pattern HTML_TAG_PATTERN = Pattern.compile("</?[a-zA-Z0-9]+\\b[^>]*>");
- private static final Pattern HTML_SPACE_PATTERN = Pattern.compile(" ");
-
- // Must correspond with LocalString_xx.properties
- // Do not use '_' because we want to seach for certain documenttype and lucene haev problems with '_'
- public static final String TYPE = "type.contexthelp";
-
- /**
- * Constructor
- */
- public ContextHelpDocument() {
- super();
- }
-
- /**
- * Factory method to create a search document for a context sensitive help page
- * @param searchResourceContext
- * @param bundleName
- * @param page
- * @param pageTranslator
- * @param ctx
- * @param pagePath
- * @return
- */
- public static Document createDocument(SearchResourceContext searchResourceContext, String bundleName, String page, Translator pageTranslator, Context ctx, String pagePath) {
- ContextHelpDocument contextHelpDocument = new ContextHelpDocument();
- I18nManager i18nMgr = I18nManager.getInstance();
-
- // Set all know attributes
- searchResourceContext.setFilePath(ContextHelpDispatcher.createContextHelpURI(pageTranslator.getLocale(), bundleName, page));
- contextHelpDocument.setResourceUrl(searchResourceContext.getResourceUrl());//to adhere to the [path=...] convention
- contextHelpDocument.setLastChange(new Date(i18nMgr.getLastModifiedDate(pageTranslator.getLocale(), bundleName)));
- String lang = I18nManager.getInstance().getLanguageTranslated(pageTranslator.getLocale().toString(), I18nModule.isOverlayEnabled());
- contextHelpDocument.setDocumentType(TYPE);
- contextHelpDocument.setCssIcon("o_icon_help");
- contextHelpDocument.setTitle(pageTranslator.translate("chelp." + page.split("\\.")[0] + ".title") + " (" + lang + ")");
-
- try {
- VelocityHelper vh = VelocityHelper.getInstance();
- StringWriter wOut = new StringWriter(10000);
- vh.mergeContent(pagePath, ctx, wOut, null);
- String mergedContent = wOut.toString();
- // Remove any HTML stuff from page
- Matcher m = HTML_TAG_PATTERN.matcher(mergedContent);
- mergedContent = m.replaceAll(" ");
- // Remove all  
- m = HTML_SPACE_PATTERN.matcher(mergedContent);
- mergedContent = m.replaceAll(" ");
- // Finally set content
- contextHelpDocument.setContent(mergedContent);
- } catch (Exception e) {
- log.error("Error indexing context help: " + bundleName + " / " + page + " in " + pageTranslator.getLocale(), e);
- contextHelpDocument.setContent("");
- }
-
- if (log.isDebug()) log.debug(contextHelpDocument.toString());
- return contextHelpDocument.getLuceneDocument();
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/org/olat/search/service/indexer/ContextHelpIndexer.java b/src/main/java/org/olat/search/service/indexer/ContextHelpIndexer.java
deleted file mode 100644
index 29f700ba8c6..00000000000
--- a/src/main/java/org/olat/search/service/indexer/ContextHelpIndexer.java
+++ /dev/null
@@ -1,170 +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.search.service.indexer;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Locale;
-import java.util.Set;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.lucene.document.Document;
-import org.apache.velocity.context.Context;
-import org.olat.core.commons.contextHelp.ContextHelpModule;
-import org.olat.core.gui.GlobalSettings;
-import org.olat.core.gui.components.velocity.VelocityContainer;
-import org.olat.core.gui.control.winmgr.AJAXFlags;
-import org.olat.core.gui.render.EmptyURLBuilder;
-import org.olat.core.gui.render.Renderer;
-import org.olat.core.gui.render.velocity.VelocityRenderDecorator;
-import org.olat.core.gui.translator.PackageTranslator;
-import org.olat.core.gui.translator.Translator;
-import org.olat.core.id.Identity;
-import org.olat.core.id.Roles;
-import org.olat.core.id.context.BusinessControl;
-import org.olat.core.id.context.ContextEntry;
-import org.olat.core.logging.OLog;
-import org.olat.core.logging.Tracing;
-import org.olat.core.util.i18n.I18nManager;
-import org.olat.core.util.i18n.I18nModule;
-import org.olat.core.util.resource.OresHelper;
-import org.olat.search.service.SearchResourceContext;
-import org.olat.search.service.document.ContextHelpDocument;
-
-/**
- * Description:<br>
- * This indexer indexes the context sensitive help system
- *
- * <P>
- * Initial Date: 05.11.2008 <br>
- * @author gnaegi
- */
-public class ContextHelpIndexer extends AbstractHierarchicalIndexer {
- private static final OLog log = Tracing.createLoggerFor(ContextHelpIndexer.class);
-
- /**
- * @see org.olat.search.service.indexer.Indexer#checkAccess(org.olat.core.id.context.ContextEntry, org.olat.core.id.context.BusinessControl, org.olat.core.id.Identity, org.olat.core.id.Roles)
- */
- @Override
- public boolean checkAccess(ContextEntry contextEntry, BusinessControl businessControl, Identity identity, Roles roles) {
- // context help is visible to everybody, even not-logged in users
- return true;
- }
-
- /**
- * @see org.olat.search.service.indexer.Indexer#getSupportedTypeName()
- */
- @Override
- public String getSupportedTypeName() {
- return OresHelper.calculateTypeName(ContextHelpModule.class);
- }
-
-
- /**
- * @see org.olat.search.service.indexer.AbstractHierarchicalIndexer#doIndex(org.olat.search.service.SearchResourceContext,
- * java.lang.Object, org.olat.search.service.indexer.OlatFullIndexer)
- */
- @Override
- public void doIndex(SearchResourceContext parentResourceContext, Object parentObject, OlatFullIndexer indexWriter) throws IOException,InterruptedException {
- if (!ContextHelpModule.isContextHelpEnabled()) {
- // don't index context help when disabled
- return;
- }
-
- Set<String> helpPageIdentifyers = ContextHelpModule.getAllContextHelpPages();
- Collection<String> languages = I18nModule.getEnabledLanguageKeys();
- GlobalSettings globalSettings = new HelpSettings();
-
- if (log.isDebug()) log.debug("ContextHelpIndexer helpPageIdentifyers.size::" + helpPageIdentifyers.size() + " and languages.size::" + languages.size());
- // loop over all help pages
- for (String helpPageIdentifyer : helpPageIdentifyers) {
- String[] identifyerSplit = helpPageIdentifyer.split(":");
- String bundleName = identifyerSplit[0];
- String page = identifyerSplit[1];
- //only index html pages
- if(page == null || !page.endsWith(".html")) {
- continue;
- }
-
- // Translator with default locale. Locale is set to each language in the
- // language iteration below
- Translator pageTranslator = new PackageTranslator(bundleName, I18nModule.getDefaultLocale());
- // Open velocity page for this help page
- String pagePath = bundleName.replace('.', '/') + ContextHelpModule.CHELP_DIR + page;
- VelocityContainer container = new VelocityContainer("contextHelpPageVC", pagePath, pageTranslator, null);
- Context ctx = container.getContext();
- Renderer renderer = Renderer.getInstance(container, pageTranslator, new EmptyURLBuilder(), null, globalSettings);
- // Add render decorator with helper methods
- VelocityRenderDecorator vrdec = new VelocityRenderDecorator(renderer, container, null);
- ctx.put("r", vrdec);
- // Add empty static dir url - only used to not generate error messages
- ctx.put("chelpStaticDirUrl", "");
- // Create document for each language using the velocity context
- for (String langCode : languages) {
- Locale locale = I18nManager.getInstance().getLocaleOrNull(langCode);
- String relPagePath = langCode + "/" + bundleName + "/" + page;
- if (log.isDebug()) log.debug("Indexing help page with path::" + relPagePath);
- SearchResourceContext searchResourceContext = new SearchResourceContext(parentResourceContext);
- searchResourceContext.setBusinessControlFor(OresHelper.createOLATResourceableType(ContextHelpModule.class.getSimpleName()));//to match the list of indexer
- // Create context help document and index now, set translator to current locale
- pageTranslator.setLocale(locale);
- Document document = ContextHelpDocument.createDocument(searchResourceContext, bundleName, page, pageTranslator, ctx, pagePath);
- indexWriter.addDocument(document);
- }
- IOUtils.closeQuietly(vrdec);
- }
- }
-
- public static class HelpSettings implements GlobalSettings {
- private final AJAXFlags empty = new EmptyAJAXFlags();
-
- @Override
- public int getFontSize() {
- return 100;
- }
-
- @Override
- public AJAXFlags getAjaxFlags() {
- return empty;
- }
-
- @Override
- public boolean isIdDivsForced() {
- return false;
- }
- }
-
- public static class EmptyAJAXFlags extends AJAXFlags {
-
- public EmptyAJAXFlags() {
- super(null);
- }
-
- @Override
- public boolean isIframePostEnabled() {
- return false;
- }
- }
-}
\ No newline at end of file
diff --git a/src/main/java/org/olat/search/ui/AdvancedSearchInputController.java b/src/main/java/org/olat/search/ui/AdvancedSearchInputController.java
index 5466063afb3..a7c22b38ed8 100644
--- a/src/main/java/org/olat/search/ui/AdvancedSearchInputController.java
+++ b/src/main/java/org/olat/search/ui/AdvancedSearchInputController.java
@@ -50,7 +50,6 @@ import org.olat.core.util.ArrayHelper;
import org.olat.core.util.StringHelper;
import org.olat.search.model.AbstractOlatDocument;
import org.olat.search.service.SearchMetadataFieldsProvider;
-import org.olat.search.service.document.ContextHelpDocument;
import org.olat.search.service.document.file.ExcelDocument;
import org.olat.search.service.document.file.HtmlDocument;
import org.olat.search.service.document.file.OpenDocument;
@@ -89,7 +88,7 @@ public class AdvancedSearchInputController extends FormBasicController {
private static final String USER_TYPES = "type.identity";
private static final String PORTFOLIO_TYPES = "type.db.EP*Map* type.group.EP*Map*";
private static final String OTHER_TYPES = TextDocument.FILE_TYPE + " " + OpenDocument.FORMULA_FILE_TYPE + " " + OpenDocument.GRAPHIC_FILE_TYPE + " "
- + ContextHelpDocument.TYPE + " " + UnkownDocument.UNKOWN_TYPE + " " + OpenDocument.TEXT_FILE_TYPE;
+ + UnkownDocument.UNKOWN_TYPE + " " + OpenDocument.TEXT_FILE_TYPE;
private final List<DocumentInfo> documentInfos = new ArrayList<DocumentInfo>();
diff --git a/src/main/java/org/olat/search/ui/SearchControllerFactory.java b/src/main/java/org/olat/search/ui/SearchControllerFactory.java
index 3cc811143d7..c9d2ac47743 100644
--- a/src/main/java/org/olat/search/ui/SearchControllerFactory.java
+++ b/src/main/java/org/olat/search/ui/SearchControllerFactory.java
@@ -45,7 +45,6 @@ import org.olat.repository.RepositoryEntry;
import org.olat.repository.RepositoryManager;
import org.olat.search.SearchServiceUIFactory;
import org.olat.search.model.ResultDocument;
-import org.olat.search.service.document.ContextHelpDocument;
import org.olat.user.UserManager;
/**
@@ -99,12 +98,7 @@ public class SearchControllerFactory implements SearchServiceUIFactory {
return creator.createController(ureq, wControl, mainForm, document);
}
- ResultController ctrl;
- if(ContextHelpDocument.TYPE.equals(documentType)) {
- ctrl = new ContextHelpResultController(ureq, wControl, mainForm, document);
- } else {
- ctrl = new StandardResultController(ureq, wControl, mainForm, document);
- }
+ ResultController ctrl = new StandardResultController(ureq, wControl, mainForm, document);
return ctrl;
}
diff --git a/src/main/resources/serviceconfig/olat.properties b/src/main/resources/serviceconfig/olat.properties
index 95ca4d18d34..c1677fb39ac 100644
--- a/src/main/resources/serviceconfig/olat.properties
+++ b/src/main/resources/serviceconfig/olat.properties
@@ -323,18 +323,16 @@ exam.mode.masternode=true
#####
# Help course and context help
#####
-# legacy support: help.course.enabled was old configuration, new is help.enabled. To use old course mechanism, set help.plugin to 'courseHelp'
-help.course.enabled=true
-help.enabled=${help.course.enabled}
+# Enable the help system. This create context help links all over the system that points to the help system configured by the help.plugin variable.
+# By default, the help opens the manual hosted in a confluence wiki at confluence.openolat.org. If you want to build your own help system, write
+# your own help plugin and configure it here.
+help.enabled=true
# Define the plugin which generate the help URL
help.plugin=ooConfluenceLinkHelp
help.plugin.values=ooConfluenceLinkHelp,courseHelp
-# Settings for the custom plugin
+# Settings for the courseHelp plugin
+# Note that when you use courseHelp, the context help will be disabled. Only the help button in the top navigation will be available and open the help course
help.course.softkey=OLAT::help-course_de.zip
-
-help.context.enabled=true
-help.context.rating.enabled=true
-#Deploy the embbeded courses as the help course
deploy.course.exports=true
deploy.course.exports.values=true,false
--
GitLab