diff --git a/src/main/java/org/olat/course/statistic/SimpleStatisticInfoHelper.java b/src/main/java/org/olat/course/statistic/SimpleStatisticInfoHelper.java
deleted file mode 100644
index 57180f3dd890237196b81d20157e5ae219270dfe..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/course/statistic/SimpleStatisticInfoHelper.java
+++ /dev/null
@@ -1,87 +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.course.statistic;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import org.olat.core.commons.persistence.DB;
-import org.olat.core.logging.OLog;
-import org.olat.core.logging.Tracing;
-
-/**
- * Simple helper class which knows about since when statistics are available.
- * <p>
- * NOTE: THIS CLASS NEEDS TO BE REFACTORED IN 6.4 INTO STATISTICUPDATEMANAGER.
- *       IN 6.3 THERE ARE MULTIPLE SPRING BEAN SCOPES - THOSE FROM
- *       olat_extensions.xml ARE NOT ACCESSIBLE FROM BEANS WITHIN
- *       olatdefaultconfig.xml.
- * <P>
- * Initial Date:  22.02.2010 <br>
- * @author Stefan
- */
-public class SimpleStatisticInfoHelper {
-
-	/** the logging object used in this class **/
-	private static final OLog log = Tracing.createLoggerFor(SimpleStatisticInfoHelper.class);
-
-	/** a map with all sql statements for the supported dbvendors **/
-	private final Map<String,String> sql;
-
-	/** the calculated creationdate **/
-	private Long creationDate;
-
-	private DB dbInstance;
-
-	public SimpleStatisticInfoHelper(DB dbInstance, Map<String, String> sql) {
-		this.dbInstance = dbInstance;
-		this.sql = sql;
-	}
-	
-	/**
-	 * Computes the creationdate_ if it's not already computed and returns it
-	 * @return the creationdate
-	 */
-	public Date getFirstLoggingTableCreationDate() {
-		if (creationDate == null) {
-			try {
-				synchronized(this) {
-					if(creationDate == null) {
-						List<?> creationDates = dbInstance.getCurrentEntityManager()
-								.createNativeQuery(sql.get(dbInstance.getDbVendor()))
-								.getResultList();
-						creationDate = creationDates == null || creationDates.isEmpty() ? null : ((Number)creationDates.get(0)).longValue();
-					}
-				}
-			} catch (Exception e) {
-				log.error("", e);
-			} finally {
-				dbInstance.commitAndCloseSession();
-			}
-		}
-		return creationDate == null ? null : new Date(creationDate);
-	}
-}
diff --git a/src/main/java/org/olat/course/statistic/StatisticDisplayController.java b/src/main/java/org/olat/course/statistic/StatisticDisplayController.java
index 33f671692b45d5e61200dc9246979dcb0b2597b1..9c3afda666e6411b0bfa9b5fbc93edf54684951c 100644
--- a/src/main/java/org/olat/course/statistic/StatisticDisplayController.java
+++ b/src/main/java/org/olat/course/statistic/StatisticDisplayController.java
@@ -26,7 +26,6 @@
 package org.olat.course.statistic;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -52,7 +51,6 @@ import org.olat.core.logging.OLog;
 import org.olat.core.logging.Tracing;
 import org.olat.core.logging.activity.StringResourceableType;
 import org.olat.core.logging.activity.ThreadLocalUserActivityLogger;
-import org.olat.core.util.Formatter;
 import org.olat.core.util.StringHelper;
 import org.olat.core.util.Util;
 import org.olat.core.util.resource.OresHelper;
@@ -63,7 +61,6 @@ import org.olat.course.nodes.CourseNode;
 import org.olat.repository.RepositoryEntry;
 import org.olat.repository.RepositoryManager;
 import org.olat.util.logging.activity.LoggingResourceable;
-import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * Base class for Statistic Display Controllers - subclass this 
@@ -93,9 +90,9 @@ public class StatisticDisplayController extends BasicController {
 	/** the logging object used in this class **/
 	private static final OLog log_ = Tracing.createLoggerFor(StatisticDisplayController.class);
 
-	private final static String CLICK_NODE_ACTION = "clicknodeaction";
+	private static final String CLICK_NODE_ACTION = "clicknodeaction";
 	
-	public final static String CLICK_TOTAL_ACTION = "clicktotalaction";
+	public static final String CLICK_TOTAL_ACTION = "clicktotalaction";
 
 	/** a possible value of statisticType in the user activity logging **/
 	private static final String STATISTIC_TYPE_VIEW_NODE_STATISTIC = "VIEW_NODE_STATISTIC";
@@ -112,15 +109,12 @@ public class StatisticDisplayController extends BasicController {
 	private final ICourse course;
 	private final IStatisticManager statisticManager;
 
-	private TableController tableCtr_;
+	private TableController tableCtr;
 	private TableController tableController;
 
-	private VelocityContainer statisticVc_;
+	private VelocityContainer statisticVc;
 
-	private Translator headerTranslator_;
-	
-	@Autowired
-	private SimpleStatisticInfoHelper statisticInfoHelper; 
+	private Translator headerTranslator;
 	
 	public StatisticDisplayController(UserRequest ureq, WindowControl windowControl, ICourse course, IStatisticManager statisticManager) {
 		super(ureq, windowControl);
@@ -133,7 +127,7 @@ public class StatisticDisplayController extends BasicController {
 		}
 		this.course = course;
 		this.statisticManager = statisticManager;
-		this.headerTranslator_ = Util.createPackageTranslator(statisticManager.getClass(), ureq.getLocale());
+		this.headerTranslator = Util.createPackageTranslator(statisticManager.getClass(), ureq.getLocale());
 
 		// statistic.html is under org.olat.course.statistic - no matter who subclasses BaseStatisticDisplayController
 		setVelocityRoot(Util.getPackageVelocityRoot(StatisticDisplayController.class));
@@ -143,20 +137,18 @@ public class StatisticDisplayController extends BasicController {
 	}
 	
 	protected Component createInitialComponent(UserRequest ureq) {
-		statisticVc_ = createVelocityContainer("statistic");
-		statisticVc_.contextPut("statsSince", getStatsSinceStr());
+		statisticVc = createVelocityContainer("statistic");
 		recreateTableController(ureq);
-		
-		return statisticVc_;
+		return statisticVc;
 	}
 
 	protected void recreateTableController(UserRequest ureq) {
 		StatisticResult result = recalculateStatisticResult(ureq);
-		tableCtr_ = createTableController(ureq, result);
-		statisticVc_.put("statisticResult", tableCtr_.getInitialComponent());
-		statisticVc_.contextPut("hasChart", Boolean.FALSE);
+		tableCtr = createTableController(ureq, result);
+		statisticVc.put("statisticResult", tableCtr.getInitialComponent());
+		statisticVc.contextPut("hasChart", Boolean.FALSE);
 
-		Graph graph = calculateNodeGraph(ureq, result.getRowCount()-1);
+		Graph graph = calculateNodeGraph(result.getRowCount()-1);
 		generateCharts(graph);
 	}
 
@@ -176,7 +168,6 @@ public class StatisticDisplayController extends BasicController {
 		tableController = new TableController(tableConfig, ureq, getWindowControl(), getTranslator());
 		listenTo(tableController);
 		
-		//		tableCtr.addColumnDescriptor(statisticManager.createColumnDescriptor(ureq, 0, null));
 		IndentedStatisticNodeRenderer indentedNodeRenderer = new IndentedStatisticNodeRenderer(Util.createPackageTranslator(statisticManager.getClass(), ureq.getLocale()));
 		indentedNodeRenderer.setSimpleRenderingOnExport(true);
 		CustomRenderColumnDescriptor nodeCD = new CustomRenderColumnDescriptor("stat.table.header.node", 0, 
@@ -184,7 +175,7 @@ public class StatisticDisplayController extends BasicController {
 			@Override
 			public int compareTo(int rowa, int rowb) {
 				// order by original row order
-				return new Integer(rowa).compareTo(rowb);
+				return Integer.valueOf(rowa).compareTo(rowb);
 			}
 		};
 		tableController.addColumnDescriptor(nodeCD);
@@ -248,31 +239,27 @@ public class StatisticDisplayController extends BasicController {
 
 	@Override
 	protected void event(UserRequest ureq, Controller source, Event event) {
-		if (source==tableCtr_ && event instanceof TableEvent) {
+		if (source==tableCtr && event instanceof TableEvent) {
 			TableEvent tableEvent = (TableEvent)event;
 			if (CLICK_NODE_ACTION.equals(tableEvent.getActionId())) {
-
 				int rowId = tableEvent.getRowId();
-				Graph graph = calculateNodeGraph(ureq, rowId);
+				Graph graph = calculateNodeGraph(rowId);
 				generateCharts(graph);
 			} else if (tableEvent.getActionId().startsWith(CLICK_TOTAL_ACTION)) {
-				
 				try{
 					int columnId = Integer.parseInt(tableEvent.getActionId().substring(CLICK_TOTAL_ACTION.length()));
-					Graph graph = calculateTotalGraph(ureq, columnId);
+					Graph graph = calculateTotalGraph(columnId);
 					generateCharts(graph);
 				} catch(NumberFormatException e) {
 					log_.warn("event: Could not convert event into columnId for rendering graph: "+tableEvent.getActionId());
-					return;
 				}
-				
 			}
 		}
 	}
 	
-	private Graph calculateNodeGraph(UserRequest ureq, int rowId) {
+	private Graph calculateNodeGraph(int rowId) {
 		
-		Object o = tableCtr_.getTableDataModel().getValueAt(rowId, 0);
+		Object o = tableCtr.getTableDataModel().getValueAt(rowId, 0);
 		String selectionInfo = "";
 		if (o instanceof Map) {
 			Map map = (Map)o;
@@ -287,16 +274,16 @@ public class StatisticDisplayController extends BasicController {
 					LoggingResourceable.wrapNonOlatResource(StringResourceableType.statisticType, "", STATISTIC_TYPE_VIEW_TOTAL_OF_NODES_STATISTIC));
 			selectionInfo = getTranslator().translate("statistic.chart.selectioninfo.total");
 		}
-		String chartIntroStr = headerTranslator_.translate("statistic.chart.intro", new String[] { selectionInfo, getStatsSinceStr() });
+		String chartIntroStr = headerTranslator.translate("statistic.chart.intro", new String[] { selectionInfo });
 		
-		StringBuffer chd = new StringBuffer();
-		List<Integer> values = new ArrayList<Integer>();
+		StringBuilder chd = new StringBuilder(4096);
+		List<Integer> values = new ArrayList<>();
 
 		int max = 10;
-		int columnCnt = tableCtr_.getTableDataModel().getColumnCount();
-		List<String> labelList = new LinkedList<String>();
+		int columnCnt = tableCtr.getTableDataModel().getColumnCount();
+		List<String> labelList = new LinkedList<>();
 		for(int column=1/*we ignore the node itself*/; column<columnCnt-1/*we ignore the total*/; column++) {
-			Object cellValue = tableCtr_.getTableDataModel().getValueAt(rowId, column);
+			Object cellValue = tableCtr.getTableDataModel().getValueAt(rowId, column);
 			Integer v = 0;
 			if (cellValue instanceof Integer) {
 				v = (Integer)cellValue;
@@ -308,10 +295,10 @@ public class StatisticDisplayController extends BasicController {
 			chd.append(v);
 			values.add(v);
 			
-			ColumnDescriptor cd = tableCtr_.getColumnDescriptor(column);
+			ColumnDescriptor cd = tableCtr.getColumnDescriptor(column);
 			String headerKey = cd.getHeaderKey();
 			if (cd.translateHeaderKey()) {
-				headerKey = headerTranslator_.translate(headerKey);
+				headerKey = headerTranslator.translate(headerKey);
 			}
 			labelList.add(headerKey);
 		}
@@ -323,32 +310,32 @@ public class StatisticDisplayController extends BasicController {
 		return result;
 	}
 
-	private Graph calculateTotalGraph(UserRequest ureq, int columnId) {
-		ColumnDescriptor cd = tableCtr_.getColumnDescriptor(columnId);
+	private Graph calculateTotalGraph(int columnId) {
+		ColumnDescriptor cd = tableCtr.getColumnDescriptor(columnId);
 		String headerKey = cd.getHeaderKey();
 		if (cd.translateHeaderKey()) {
-			headerKey = headerTranslator_.translate(headerKey);
+			headerKey = headerTranslator.translate(headerKey);
 		}
 		String selectionInfo = headerKey;
 		String chartIntroStr;
-		if (columnId==tableCtr_.getTableDataModel().getColumnCount()-1) {
+		if (columnId==tableCtr.getTableDataModel().getColumnCount()-1) {
 			ThreadLocalUserActivityLogger.log(StatisticLoggingAction.VIEW_TOTAL_TOTAL_STATISTIC, getClass(), 
 					LoggingResourceable.wrapNonOlatResource(StringResourceableType.statisticType, "", STATISTIC_TYPE_VIEW_TOTAL_TOTAL_STATISTIC));
-			chartIntroStr = headerTranslator_.translate("statistic.chart.pernode.total.intro", new String[] { getStatsSinceStr() });
+			chartIntroStr = headerTranslator.translate("statistic.chart.pernode.total.intro");
 		} else {
 			ThreadLocalUserActivityLogger.log(StatisticLoggingAction.VIEW_TOTAL_BY_VALUE_STATISTIC, getClass(), 
 					LoggingResourceable.wrapNonOlatResource(StringResourceableType.statisticType, "", STATISTIC_TYPE_VIEW_TOTAL_BY_VALUE_STATISTIC),
 					LoggingResourceable.wrapNonOlatResource(StringResourceableType.statisticColumn, "", selectionInfo));
-			chartIntroStr = headerTranslator_.translate("statistic.chart.pernode.intro", new String[] { selectionInfo });
+			chartIntroStr = headerTranslator.translate("statistic.chart.pernode.intro", new String[] { selectionInfo });
 		}
 		
-		StringBuffer chd = new StringBuffer();
+		StringBuilder chd = new StringBuilder(4096);
 
 		int max = 10;
 		
-		List<String> labelList = new LinkedList<String>();
-		for(int row=0; row<tableCtr_.getTableDataModel().getRowCount()-1; row++) {
-			Object cellValue = tableCtr_.getTableDataModel().getValueAt(row, columnId);
+		List<String> labelList = new LinkedList<>();
+		for(int row=0; row<tableCtr.getTableDataModel().getRowCount()-1; row++) {
+			Object cellValue = tableCtr.getTableDataModel().getValueAt(row, columnId);
 			Integer v = 0;
 			if (cellValue instanceof Integer) {
 				v = (Integer)cellValue;
@@ -359,7 +346,7 @@ public class StatisticDisplayController extends BasicController {
 			}
 			chd.append(v);
 			
-			Map m = (Map)tableCtr_.getTableDataModel().getValueAt(row, 0);
+			Map m = (Map)tableCtr.getTableDataModel().getValueAt(row, 0);
 			headerKey = "n/a";
 			if (m!=null) {
 				headerKey = (String) m.get(AssessmentHelper.KEY_TITLE_SHORT);
@@ -370,12 +357,12 @@ public class StatisticDisplayController extends BasicController {
 		Graph result = new Graph();
 		result.labelList = labelList;
 		result.chartIntroStr = chartIntroStr;
-		result.numElements = tableCtr_.getTableDataModel().getRowCount()-1;
+		result.numElements = tableCtr.getTableDataModel().getRowCount()-1;
 		return result;
 	}
 	private void generateCharts(Graph graph) {
-		statisticVc_.contextPut("hasChart", Boolean.FALSE);
-		statisticVc_.contextPut("hasChartError", Boolean.FALSE);
+		statisticVc.contextPut("hasChart", Boolean.FALSE);
+		statisticVc.contextPut("hasChartError", Boolean.FALSE);
 		if (graph==null || graph.numElements==0) {
 			Component ic = getInitialComponent();
 			if (ic!=null) {
@@ -384,10 +371,10 @@ public class StatisticDisplayController extends BasicController {
 			return;
 		}
 		try{
-			statisticVc_.contextPut("chartAlt", getTranslator().translate("chart.alt"));
-			statisticVc_.contextPut("chartIntro", graph.chartIntroStr);
-			statisticVc_.contextPut("hasChart", Boolean.TRUE);
-			statisticVc_.contextPut("hasChartError", Boolean.FALSE);
+			statisticVc.contextPut("chartAlt", getTranslator().translate("chart.alt"));
+			statisticVc.contextPut("chartIntro", graph.chartIntroStr);
+			statisticVc.contextPut("hasChart", Boolean.TRUE);
+			statisticVc.contextPut("hasChartError", Boolean.FALSE);
 			
 			BarChartComponent chartCmp = new BarChartComponent("stats");
 			List<String> labels = graph.getLabels();
@@ -399,7 +386,7 @@ public class StatisticDisplayController extends BasicController {
 				serie.add(value, category);
 			}
 			chartCmp.addSeries(serie);
-			statisticVc_.put("chart", chartCmp);
+			statisticVc.put("chart", chartCmp);
 			
 		} catch(RuntimeException re) {
 			log_.warn("generateCharts: RuntimeException during chart generation: "+re, re);
@@ -409,14 +396,6 @@ public class StatisticDisplayController extends BasicController {
 			ic.setDirty(true);
 		}
 	}
-
-	protected String getStatsSinceStr() {
-		Date d = statisticInfoHelper.getFirstLoggingTableCreationDate();
-		if (d==null) {
-			return "n/a";
-		}
-		return Formatter.getInstance(getLocale()).formatDate(d);
-	}
 	
 	@Override
 	protected void doDispose() {
diff --git a/src/main/java/org/olat/course/statistic/StatisticResult.java b/src/main/java/org/olat/course/statistic/StatisticResult.java
index 85e60a96ce89112a417479646abc3cde0ee22b1a..e63b541680910b705105abd97cc02de49545581f 100644
--- a/src/main/java/org/olat/course/statistic/StatisticResult.java
+++ b/src/main/java/org/olat/course/statistic/StatisticResult.java
@@ -36,6 +36,8 @@ import java.util.Map;
 import java.util.Set;
 
 import org.olat.core.gui.components.table.TableDataModel;
+import org.olat.core.logging.OLog;
+import org.olat.core.logging.Tracing;
 import org.olat.core.util.nodes.INode;
 import org.olat.course.ICourse;
 import org.olat.course.assessment.AssessmentHelper;
@@ -43,17 +45,19 @@ import org.olat.course.nodes.CourseNode;
 
 /** work in progress **/
 public class StatisticResult implements TableDataModel {
+	
+	private static final OLog log = Tracing.createLoggerFor(StatisticResult.class);
 
 	/** token representing the title cell in the total row - renderers must know how to render this **/
 	static final Object TOTAL_ROW_TITLE_CELL = new Object();
 	
 	public static final String KEY_NODE = "result_key_node";
 	
-	private List<String> columnHeaders_ = new LinkedList<String>();
+	private List<String> columnHeaders_ = new LinkedList<>();
 	
-	private List<CourseNode> orderedNodesList_ = new LinkedList<CourseNode>();
+	private List<CourseNode> orderedNodesList_ = new LinkedList<>();
 
-	private Map<CourseNode,Map<String,Integer>> statistic_ = new HashMap<CourseNode, Map<String,Integer>>();
+	private Map<CourseNode,Map<String,Integer>> statistic_ = new HashMap<>();
 	
 	/**
 	 * mysql> select businesspath,day,value from o_stat_dayofweek where businesspath like '[RepositoryEntry:393216]%';
@@ -65,13 +69,13 @@ public class StatisticResult implements TableDataModel {
 | [RepositoryEntry:393216][CourseNode:73156787421533] |   4 |    34 |
 	 */
 	public StatisticResult(ICourse course, List<Object[]> result) {
-		final Set<String> groupByKeys = new HashSet<String>();
+		final Set<String> groupByKeys = new HashSet<>();
 		doAddQueryListResultsForNodeAndChildren(course.getRunStructure().getRootNode(), result, groupByKeys);
-		if (result.size()!=0) {
-			System.out.println("ERROR - should have 0 left....: "+result.size());
+		if (!result.isEmpty()) {
+			log.error("ERROR - should have 0 left....: " + result.size());
 		}
 		
-		columnHeaders_ = new LinkedList<String>(groupByKeys);
+		columnHeaders_ = new LinkedList<>(groupByKeys);
 		Collections.sort(columnHeaders_, new Comparator<String>() {
 
 			@Override 
@@ -96,11 +100,11 @@ public class StatisticResult implements TableDataModel {
 	}
 	
 	public List<String> getColumnHeaders() {
-		return new ArrayList<String>(columnHeaders_);
+		return new ArrayList<>(columnHeaders_);
 	}
 	
 	public void setColumnHeaders(List<String> columnHeaders) {
-		columnHeaders_ = new ArrayList<String>(columnHeaders);
+		columnHeaders_ = new ArrayList<>(columnHeaders);
 	}
 	
 	private void doAddQueryListResultsForNodeAndChildren(CourseNode node, List<Object[]> result, Set<String> groupByKeys) {
@@ -123,7 +127,7 @@ public class StatisticResult implements TableDataModel {
 			
 			Map<String,Integer> nodeMap = statistic_.get(node);
 			if (nodeMap==null) {
-				nodeMap = new HashMap<String,Integer>();
+				nodeMap = new HashMap<>();
 				statistic_.put(node, nodeMap);
 			}
 			
@@ -166,9 +170,9 @@ public class StatisticResult implements TableDataModel {
 		// Store node data in hash map. This hash map serves as data model for 
 		// the user assessment overview table. Leave user data empty since not used in
 		// this table. (use only node data)
-		Map<String,Object> nodeData = new HashMap<String, Object>();
+		Map<String,Object> nodeData = new HashMap<>();
 		// indent
-		nodeData.put(AssessmentHelper.KEY_INDENT, new Integer(recursionLevel));
+		nodeData.put(AssessmentHelper.KEY_INDENT, Integer.valueOf(recursionLevel));
 		// course node data
 		nodeData.put(AssessmentHelper.KEY_TYPE, node.getType());
 		nodeData.put(AssessmentHelper.KEY_TITLE_SHORT, node.getShortTitle());
@@ -181,7 +185,7 @@ public class StatisticResult implements TableDataModel {
 	}
 
 	public List<String> getHeaders() {
-		return new ArrayList<String>(columnHeaders_);
+		return new ArrayList<>(columnHeaders_);
 	}
 
 	@Override
@@ -224,8 +228,8 @@ public class StatisticResult implements TableDataModel {
 					if (statisticMap==null) {
 						continue;
 					}
-					for (Iterator it2 = statisticMap.values().iterator(); it2.hasNext();) {
-						Integer num = (Integer) it2.next();
+					for (Iterator<Integer> it2 = statisticMap.values().iterator(); it2.hasNext();) {
+						Integer num = it2.next();
 						if (num!=null) {
 							total+=num;
 						}
diff --git a/src/main/java/org/olat/course/statistic/_content/statistic.html b/src/main/java/org/olat/course/statistic/_content/statistic.html
index 57ea38deec271319d6d266b3002376145c54a788..856251f23f565434d997764346e2b22bf04b3cdd 100644
--- a/src/main/java/org/olat/course/statistic/_content/statistic.html
+++ b/src/main/java/org/olat/course/statistic/_content/statistic.html
@@ -2,7 +2,7 @@
 <fieldset class="o_form form-horizontal">
 	<legend>
 		$r.translate("statistic.title")</legend>
-	<div class="o_desc">$r.translate("statistic.intro", $statsSince)</div>
+	<div class="o_desc">$r.translate("statistic.intro")</div>
 </fieldset>
 $r.render("statisticResult")
 #if($hasChart)
diff --git a/src/main/java/org/olat/course/statistic/_spring/statisticContext.xml b/src/main/java/org/olat/course/statistic/_spring/statisticContext.xml
index 5efc54ffaf589808eb1c2cd318992f596892828f..748555763b45fb8030894f59431fc805921bebe5 100644
--- a/src/main/java/org/olat/course/statistic/_spring/statisticContext.xml
+++ b/src/main/java/org/olat/course/statistic/_spring/statisticContext.xml
@@ -454,23 +454,4 @@ insert into o_stat_hourofday (businesspath, resid, hour, value)
 		<constructor-arg value="${cluster.singleton.services}"/>
 		<property name="taskExecutorManager" ref="taskExecutorManager"/>
 	</bean>
-
-	<bean class="org.olat.course.statistic.SimpleStatisticInfoHelper" >
-		<constructor-arg>
-			<ref bean="database"/>
-		</constructor-arg>
-		<constructor-arg>
-			<map>
-				<entry key="mysql">
-					<value>select unix_timestamp(creationdate) from o_loggingtable limit 1;</value>
-				</entry>
-				<entry key="postgresql">
-					<value>select round(date_part('epoch', creationdate)) from o_loggingtable limit 1;</value>
-				</entry>
-				<entry key="oracle">
-					<value>select round((creationdate - TO_DATE('19700101000000','YYYYMMDDHH24MISS'))*86400) from o_loggingtable where rownum=1</value>
-				</entry>
-			</map>
-		</constructor-arg>
-	</bean>
 </beans>
\ No newline at end of file
diff --git a/src/main/java/org/olat/course/statistic/daily/DailyStatisticDisplayController.java b/src/main/java/org/olat/course/statistic/daily/DailyStatisticDisplayController.java
index c2969ed5be38a0053f433caadfb0901f686d4c42..ae4b27a5973c1cdf00c337520839f8a0ee587e21 100644
--- a/src/main/java/org/olat/course/statistic/daily/DailyStatisticDisplayController.java
+++ b/src/main/java/org/olat/course/statistic/daily/DailyStatisticDisplayController.java
@@ -39,9 +39,7 @@ import org.olat.course.statistic.StatisticResult;
 
 public class DailyStatisticDisplayController extends StatisticDisplayController {
 
-	private VelocityContainer dailyStatisticFormVc_;
-	private VelocityContainer dailyStatisticVc_;
-	private DateChooserForm form_;
+	private DateChooserForm dateChooser;
 
 	public DailyStatisticDisplayController(UserRequest ureq, WindowControl windowControl, ICourse course, IStatisticManager statisticManager) {
 		super(ureq, windowControl, course, statisticManager);
@@ -51,24 +49,24 @@ public class DailyStatisticDisplayController extends StatisticDisplayController
 	protected Component createInitialComponent(UserRequest ureq) {
 		setVelocityRoot(Util.getPackageVelocityRoot(getClass()));
 
-		dailyStatisticVc_ = this.createVelocityContainer("dailystatisticparent");
+		VelocityContainer dailyStatisticVc = this.createVelocityContainer("dailystatisticparent");
 		
-		dailyStatisticFormVc_ = this.createVelocityContainer("dailystatisticform");
-		form_ = new DateChooserForm(ureq, getWindowControl(), 7);
-		listenTo(form_);
-		dailyStatisticFormVc_.put("statisticForm", form_.getInitialComponent());
-		dailyStatisticFormVc_.contextPut("statsSince", getStatsSinceStr());
+		VelocityContainer dailyStatisticFormVc = this.createVelocityContainer("dailystatisticform");
+		dateChooser = new DateChooserForm(ureq, getWindowControl(), 7);
+		listenTo(dateChooser);
+		dailyStatisticFormVc.put("statisticForm", dateChooser.getInitialComponent());
 
-		dailyStatisticVc_.put("dailystatisticform", dailyStatisticFormVc_);
+		dailyStatisticVc.put("dailystatisticform", dailyStatisticFormVc);
 
 		Component parentInitialComponent = super.createInitialComponent(ureq);
-		dailyStatisticVc_.put("statistic", parentInitialComponent);
+		dailyStatisticVc.put("statistic", parentInitialComponent);
 		
-		return dailyStatisticVc_;
+		return dailyStatisticVc;
 	}
 
+	@Override
 	public void event(UserRequest ureq, Controller source, Event event) {
-		if (source == form_ && event == Event.DONE_EVENT) {
+		if (source == dateChooser && event == Event.DONE_EVENT) {
 			// need to regenerate the statisticResult
 			
 			if (!(getStatisticManager() instanceof DailyStatisticManager)) {
@@ -86,10 +84,7 @@ public class DailyStatisticDisplayController extends StatisticDisplayController
 	@Override
 	protected StatisticResult recalculateStatisticResult(UserRequest ureq) {
 		// recalculate the statistic result based on the from and to dates.
-		// do this by going via sql (see DailyStatisticManager)
-		DailyStatisticManager dailyStatisticManager = (DailyStatisticManager)getStatisticManager();			
-		StatisticResult statisticResult = 
-			dailyStatisticManager.generateStatisticResult(ureq, getCourse(), getCourseRepositoryEntryKey(), form_.getFromDate(), form_.getToDate());
-		return statisticResult;
+		// do this by going via sql (see DailyStatisticManager)	
+		return getStatisticManager().generateStatisticResult(ureq, getCourse(), getCourseRepositoryEntryKey(), dateChooser.getFromDate(), dateChooser.getToDate());
 	}
 }
diff --git a/src/main/java/org/olat/course/statistic/daily/DailyStatisticManager.java b/src/main/java/org/olat/course/statistic/daily/DailyStatisticManager.java
index 404fd7af63e2fbe5e1dffba62a1ad98f2d03e915..9ddc3d691acc7041c30c77a494af6e2965b03ffe 100644
--- a/src/main/java/org/olat/course/statistic/daily/DailyStatisticManager.java
+++ b/src/main/java/org/olat/course/statistic/daily/DailyStatisticManager.java
@@ -60,7 +60,7 @@ public class DailyStatisticManager implements IStatisticManager {
 	/** the SimpleDateFormat with which the column headers will be created formatted by the database, 
 	 * so change this in coordination with any db changes if you really need to 
 	 **/
-	private final SimpleDateFormat columnHeaderFormat_ = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+	private final SimpleDateFormat columnHeaderFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
 
 	@Override
 	public StatisticResult generateStatisticResult(UserRequest ureq, ICourse course, long courseRepositoryEntryKey) {
@@ -79,7 +79,7 @@ public class DailyStatisticManager implements IStatisticManager {
 		
 		String header = headerId;
 		try{
-			Date d = columnHeaderFormat_.parse(headerId);
+			Date d = columnHeaderFormat.parse(headerId);
 
 			Calendar c = Calendar.getInstance(ureq.getLocale());
 			c.setTime(d);
@@ -139,19 +139,19 @@ public class DailyStatisticManager implements IStatisticManager {
 		}
 		try{
 			String firstDate = columnHeaders.get(0);
-			Date fromDate = columnHeaderFormat_.parse(firstDate);
+			Date fromDate = columnHeaderFormat.parse(firstDate);
 			Date previousDate = new Date(fromDate.getTime()); // copy fromDate
-			final long DAY_DIFF = 24*60*60*1000;
+			final long DAY_DIFF = 24l * 60l * 60l * 1000l;
 			for (int i = 1; i < columnHeaders.size(); i++) {
 				String aDate = columnHeaders.get(i);
-				Date currDate = columnHeaderFormat_.parse(aDate);
+				Date currDate = columnHeaderFormat.parse(aDate);
 				long diff = currDate.getTime() - previousDate.getTime();
 				// note that we should have full days - we have the HH:MM:SS set to 00:00:00 - hence the
 				// difference should always be a full day
 				if (diff>DAY_DIFF) {
 					// then we should add a few days in here
 					Date additionalDate = new Date(previousDate.getTime() + DAY_DIFF);
-					String additionalDateStr = columnHeaderFormat_.format(additionalDate);
+					String additionalDateStr = columnHeaderFormat.format(additionalDate);
 					columnHeaders.add(i, additionalDateStr);
 					previousDate = additionalDate;
 				} else {
@@ -164,5 +164,4 @@ public class DailyStatisticManager implements IStatisticManager {
 			log.warn("fillGapsInColumnHeaders: Got a ParseException while trying to fill gaps. Giving up. ",e);
 		}
 	}
-
 }
diff --git a/src/main/java/org/olat/course/statistic/daily/_content/dailystatisticform.html b/src/main/java/org/olat/course/statistic/daily/_content/dailystatisticform.html
index 03cfb800fe7f1b7b6bae5884046399b624440fa6..c72e5603560034077076533692e4ef6a751b9021 100644
--- a/src/main/java/org/olat/course/statistic/daily/_content/dailystatisticform.html
+++ b/src/main/java/org/olat/course/statistic/daily/_content/dailystatisticform.html
@@ -1,6 +1,5 @@
 <fieldset class="o_form form-horizontal">
-	<legend>
-		$r.translate("statistic.title")</legend>
-	<div class="o_desc">$r.translate("statistic.intro", $statsSince)</div>
+	<legend>$r.translate("statistic.title")</legend>
+	<div class="o_desc">$r.translate("statistic.intro")</div>
 	$r.render("statisticForm")
 </fieldset>
diff --git a/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_ar.properties b/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_ar.properties
index a9b52cbe17af7868d767edc8ee95f84ff01d6cc0..bd19ec5027c450cafbcdca62bdddcfa485a4c65a 100644
--- a/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_ar.properties
+++ b/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_ar.properties
@@ -14,8 +14,8 @@ stat.table.header.day6=\u0627\u0644\u062C\u0645\u0639\u0629
 stat.table.header.day7=\u0627\u0644\u0633\u0628\u062A
 stat.table.header.node=\u0639\u0646\u0635\u0631 \u0627\u0644\u0645\u0642\u0631\u0631
 stat.table.header.total=\u0627\u0644\u0645\u062C\u0645\u0648\u0639
-statistic.chart.intro=\u064A\u0639\u0631\u0636 \u0647\u0630\u0627 \u0627\u0644\u0645\u062E\u0637\u0637 \u0643\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A {0} \u0628\u0646\u0627\u0621\u0627\u064B \u0639\u0644\u0649 \u0643\u0644 \u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0645\u0642\u0631\u0631 \u0627\u0644\u0645\u062A\u0627\u062D\u0629 (\u0645\u0646\u0630{1}) \u0641\u0649 \u0643\u0644 \u064A\u0648\u0645.
+statistic.chart.intro=\u064A\u0639\u0631\u0636 \u0647\u0630\u0627 \u0627\u0644\u0645\u062E\u0637\u0637 \u0643\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A {0} \u0628\u0646\u0627\u0621\u0627\u064B \u0639\u0644\u0649 \u0643\u0644 \u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0645\u0642\u0631\u0631 \u0627\u0644\u0645\u062A\u0627\u062D\u0629 \u0641\u0649 \u0643\u0644 \u064A\u0648\u0645.
 statistic.chart.pernode.intro=.{0} \u064A\u0639\u0631\u0636 \u0647\u0630\u0627 \u0627\u0644\u0645\u062E\u0637\u0637 \u0643\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0644\u0639\u0646\u0627\u0635\u0631 \u0627\u0644\u0645\u0642\u0631\u0631 \u0641\u0649
 statistic.chart.pernode.total.intro=\u064A\u0639\u0631\u0636 \u0647\u0630\u0627 \u0627\u0644\u0645\u062E\u0637\u0637 \u0643\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0644\u0639\u0646\u0627\u0635\u0631 \u0627\u0644\u0645\u0642\u0631\u0631 \u062E\u0644\u0627\u0644 \u0627\u0644\u0641\u062A\u0631\u0629 \u0627\u0644\u0645\u062D\u062F\u062F\u0629.
-statistic.intro=\u064A\u0639\u0631\u0636 \u0647\u0630\u0627 \u0627\u0644\u0625\u062D\u0635\u0627\u0621 \u0643\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0644\u0639\u0646\u0627\u0635\u0631 \u0627\u0644\u0645\u0642\u0631\u0631 \u0628\u0646\u0627\u0621\u0627\u064B \u0639\u0644\u0649 \u0643\u0644 \u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0645\u0642\u0631\u0631 \u0627\u0644\u0645\u062A\u0627\u062D\u0629 (\u0645\u0646\u0630{0}) \u0641\u0649 \u0643\u0644 \u064A\u0648\u0645.
+statistic.intro=\u064A\u0639\u0631\u0636 \u0647\u0630\u0627 \u0627\u0644\u0625\u062D\u0635\u0627\u0621 \u0643\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0644\u0639\u0646\u0627\u0635\u0631 \u0627\u0644\u0645\u0642\u0631\u0631 \u0628\u0646\u0627\u0621\u0627\u064B \u0639\u0644\u0649 \u0643\u0644 \u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0645\u0642\u0631\u0631 \u0627\u0644\u0645\u062A\u0627\u062D\u0629 \u0641\u0649 \u0643\u0644 \u064A\u0648\u0645.
 statistic.title=\u0627\u0644\u0625\u062D\u0635\u0627\u0626\u064A\u0627\u062A \u0627\u0644\u064A\u0648\u0645\u064A\u0629
diff --git a/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_de.properties
index 2ab3c39a2f80d9ebe8c8de901181be98cd520367..391cfd42116d37dcd8bcd40025807945824628a7 100644
--- a/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_de.properties
@@ -2,8 +2,8 @@ menu.createstatfile=T\u00E4glich
 menu.createstatfile.alt=T\u00E4gliche Statistik anzeigen
 
 statistic.title=T\u00E4gliche Statistik
-statistic.intro=Diese Statistik zeigt alle Zugriffe auf die Kursbausteine basierend auf allen verf\u00FCgbaren Kursdaten (seit {0}) pro Tag.
-statistic.chart.intro=Diese Grafik zeigt alle Zugriffe {0} basierend auf allen verf\u00FCgbaren Kursdaten (seit {1}) pro Tag.
+statistic.intro=Diese Statistik zeigt alle Zugriffe auf die Kursbausteine basierend auf allen verf\u00FCgbaren Kursdaten pro Tag.
+statistic.chart.intro=Diese Grafik zeigt alle Zugriffe {0} basierend auf allen verf\u00FCgbaren Kursdaten pro Tag.
 statistic.chart.pernode.intro=Diese Grafik zeigt die Zugriffe auf die Kursbausteine am {0}.
 statistic.chart.pernode.total.intro=Diese Grafik zeigt alle Zugriffe auf die Kursbausteine w\u00e4hrend der gew\u00e4hlten Zeitspanne.
 
diff --git a/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_el.properties b/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_el.properties
index 63ebea99c4111ab9d8752e709dd87089596fb9c2..7181ffd01282771b9522714f6a37a57ab2f75770 100644
--- a/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_el.properties
+++ b/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_el.properties
@@ -14,8 +14,8 @@ stat.table.header.day6=\u03A0\u03B1\u03C1\u03B1\u03C3\u03BA\u03B5\u03C5\u03AE
 stat.table.header.day7=\u03A3\u03AC\u03B2\u03B2\u03B1\u03C4\u03BF
 stat.table.header.node=\u03A3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03BF \u03BC\u03B1\u03B8\u03AE\u03BC\u03B1\u03C4\u03BF\u03C2
 stat.table.header.total=\u03A3\u03CD\u03BD\u03BF\u03BB\u03BF
-statistic.chart.intro=\u0391\u03C5\u03C4\u03CC \u03C4\u03BF \u03B4\u03B9\u03AC\u03B3\u03C1\u03B1\u03BC\u03BC\u03B1 \u03C0\u03B1\u03C1\u03BF\u03C5\u03C3\u03B9\u03AC\u03B6\u03B5\u03B9 \u03CC\u03BB\u03B5\u03C2 \u03C4\u03B9\u03C2 \u03C0\u03C1\u03BF\u03C3\u03B2\u03AC\u03C3\u03B5\u03B9\u03C2 {0} \u03B2\u03AC\u03C3\u03B5\u03B9 \u03CC\u03BB\u03C9\u03BD \u03C4\u03C9\u03BD \u03B4\u03B9\u03B1\u03B8\u03AD\u03C3\u03B9\u03BC\u03C9\u03BD \u03B4\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03C9\u03BD \u03C4\u03C9\u03BD \u03BC\u03B1\u03B8\u03B7\u03BC\u03AC\u03C4\u03C9\u03BD (\u03B1\u03C0\u03CC {1}) \u03B1\u03BD\u03AC \u03B7\u03BC\u03AD\u03C1\u03B1.
+statistic.chart.intro=\u0391\u03C5\u03C4\u03CC \u03C4\u03BF \u03B4\u03B9\u03AC\u03B3\u03C1\u03B1\u03BC\u03BC\u03B1 \u03C0\u03B1\u03C1\u03BF\u03C5\u03C3\u03B9\u03AC\u03B6\u03B5\u03B9 \u03CC\u03BB\u03B5\u03C2 \u03C4\u03B9\u03C2 \u03C0\u03C1\u03BF\u03C3\u03B2\u03AC\u03C3\u03B5\u03B9\u03C2 {0} \u03B2\u03AC\u03C3\u03B5\u03B9 \u03CC\u03BB\u03C9\u03BD \u03C4\u03C9\u03BD \u03B4\u03B9\u03B1\u03B8\u03AD\u03C3\u03B9\u03BC\u03C9\u03BD \u03B4\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03C9\u03BD \u03C4\u03C9\u03BD \u03BC\u03B1\u03B8\u03B7\u03BC\u03AC\u03C4\u03C9\u03BD \u03B1\u03BD\u03AC \u03B7\u03BC\u03AD\u03C1\u03B1.
 statistic.chart.pernode.intro=\u0391\u03C5\u03C4\u03CC \u03C4\u03BF \u03B4\u03B9\u03AC\u03B3\u03C1\u03B1\u03BC\u03BC\u03B1 \u03C0\u03B1\u03C1\u03BF\u03C5\u03C3\u03B9\u03AC\u03B6\u03B5\u03B9 \u03CC\u03BB\u03B5\u03C2 \u03C4\u03B9\u03C2 \u03C0\u03C1\u03BF\u03C3\u03B2\u03AC\u03C3\u03B5\u03B9\u03C2 \u03C3\u03B5 \u03C3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03B1 \u03BC\u03B1\u03B8\u03AE\u03BC\u03B1\u03C4\u03BF\u03C2 \u03C3\u03C4\u03B9\u03C2 {0}.
 statistic.chart.pernode.total.intro=\u0391\u03C5\u03C4\u03CC \u03C4\u03BF \u03B4\u03B9\u03AC\u03B3\u03C1\u03B1\u03BC\u03BC\u03B1 \u03C0\u03B1\u03C1\u03BF\u03C5\u03C3\u03B9\u03AC\u03B6\u03B5\u03B9 \u03CC\u03BB\u03B5\u03C2 \u03C4\u03B9\u03C2 \u03C0\u03C1\u03BF\u03C3\u03B2\u03AC\u03C3\u03B5\u03B9\u03C2 \u03C3\u03B5 \u03C3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03B1 \u03BC\u03B1\u03B8\u03AE\u03BC\u03B1\u03C4\u03BF\u03C2 \u03BA\u03B1\u03C4\u03AC \u03C4\u03B7 \u03B4\u03B9\u03AC\u03C1\u03BA\u03B5\u03B9\u03B1 \u03C4\u03BF\u03C5 \u03C7\u03C1\u03BF\u03BD\u03B9\u03BA\u03BF\u03CD \u03B4\u03B9\u03B1\u03C3\u03C4\u03AE\u03BC\u03B1\u03C4\u03BF\u03C2 \u03C0\u03BF\u03C5 \u03AD\u03C7\u03B5\u03B9 \u03B5\u03C0\u03B9\u03BB\u03B5\u03B3\u03B5\u03AF.
-statistic.intro=\u0391\u03C5\u03C4\u03CC \u03C4\u03BF \u03C3\u03C4\u03B1\u03C4\u03B9\u03C3\u03C4\u03B9\u03BA\u03CC \u03B5\u03BC\u03C6\u03B1\u03BD\u03AF\u03B6\u03B5\u03B9 \u03CC\u03BB\u03B5\u03C2 \u03C4\u03B9\u03C2 \u03C0\u03C1\u03BF\u03C3\u03B2\u03AC\u03C3\u03B5\u03B9\u03C2 \u03C3\u03B5 \u03C3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03B1 \u03BC\u03B1\u03B8\u03AE\u03BC\u03B1\u03C4\u03BF\u03C2 \u03B2\u03AC\u03C3\u03B5\u03BF \u03CC\u03BB\u03C9\u03BD \u03C4\u03C9\u03BD \u03B4\u03B9\u03B1\u03B8\u03AD\u03C3\u03B9\u03BC\u03C9\u03BD \u03B4\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03C9\u03BD \u03C4\u03C9\u03BD \u03BC\u03B1\u03B8\u03B7\u03BC\u03AC\u03C4\u03C9\u03BD (\u03B1\u03C0\u03CC {0}) \u03B1\u03BD\u03AC \u03B7\u03BC\u03AD\u03C1\u03B1.
+statistic.intro=\u0391\u03C5\u03C4\u03CC \u03C4\u03BF \u03C3\u03C4\u03B1\u03C4\u03B9\u03C3\u03C4\u03B9\u03BA\u03CC \u03B5\u03BC\u03C6\u03B1\u03BD\u03AF\u03B6\u03B5\u03B9 \u03CC\u03BB\u03B5\u03C2 \u03C4\u03B9\u03C2 \u03C0\u03C1\u03BF\u03C3\u03B2\u03AC\u03C3\u03B5\u03B9\u03C2 \u03C3\u03B5 \u03C3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03B1 \u03BC\u03B1\u03B8\u03AE\u03BC\u03B1\u03C4\u03BF\u03C2 \u03B2\u03AC\u03C3\u03B5\u03BF \u03CC\u03BB\u03C9\u03BD \u03C4\u03C9\u03BD \u03B4\u03B9\u03B1\u03B8\u03AD\u03C3\u03B9\u03BC\u03C9\u03BD \u03B4\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03C9\u03BD \u03C4\u03C9\u03BD \u03BC\u03B1\u03B8\u03B7\u03BC\u03AC\u03C4\u03C9\u03BD \u03B1\u03BD\u03AC \u03B7\u03BC\u03AD\u03C1\u03B1.
 statistic.title=\u0397\u03BC\u03B5\u03C1\u03AE\u03C3\u03B9\u03B1 \u03C3\u03C4\u03B1\u03C4\u03B9\u03C3\u03C4\u03B9\u03BA\u03AC
diff --git a/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_en.properties
index 2b9205ed18be2b86d409aada3fb99ee3b36d7db2..f793b3e2bb5a20c55bd85f820efe742a1d895a15 100644
--- a/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_en.properties
@@ -14,8 +14,8 @@ stat.table.header.day6=Friday
 stat.table.header.day7=Saturday
 stat.table.header.node=Course element
 stat.table.header.total=Total
-statistic.chart.intro=This chart shows all accesses {0} based on the entire course data available (since {1}) per day.
+statistic.chart.intro=This chart shows all accesses {0} based on the entire course data available per day.
 statistic.chart.pernode.intro=This chart shows all accesses to course elements on {0}.
 statistic.chart.pernode.total.intro=This chart shows all accesses to course elements during the time period selected.
-statistic.intro=This statistic shows all accesses to course elements based on the entire course data available (since {0}) per day.
+statistic.intro=This statistic shows all accesses to course elements based on the entire course data available per day.
 statistic.title=Daily statistics
diff --git a/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_fr.properties
index 33324192613d74141fe33a44bb6c347999bc8906..551efb40469dc1817fa7934e7897d04cc7504a87 100644
--- a/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_fr.properties
@@ -14,8 +14,8 @@ stat.table.header.day6=Vendredi
 stat.table.header.day7=Samedi
 stat.table.header.node=\u00E9l\u00E9ment de cours
 stat.table.header.total=total
-statistic.chart.intro=Ce graphique montre tous les acc\u00E8s {0} bas\u00E9 sur tous les donn\u00E9es de cours disponibles (par {1}) par jour.
+statistic.chart.intro=Ce graphique montre tous les acc\u00E8s {0} bas\u00E9 sur tous les donn\u00E9es de cours disponibles par jour.
 statistic.chart.pernode.intro=Ce graphique montre tous les acc\u00E8s sur les \u00E9l\u00E9ments de cours le {0}.
 statistic.chart.pernode.total.intro=Ce graphique montre tous les acc\u00E8s sur les \u00E9l\u00E9ments de cours pendant la p\u00E9riode s\u00E9lectionn\u00E9.
-statistic.intro=Ces statistiques montre tous les acc\u00E8s sur les \u00E9l\u00E9ments de cours bas\u00E9 sur tous les donn\u00E9es de cours disponibles (depuis {0}) par jour.
+statistic.intro=Ces statistiques montre tous les acc\u00E8s sur les \u00E9l\u00E9ments de cours bas\u00E9 sur tous les donn\u00E9es de cours disponibles par jour.
 statistic.title=Statistiques quotidiennes
diff --git a/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_it.properties
index 0b76e7111f2260bb9b79561d7d5f267329a1ddf5..ad142dd5a90c7061732d1584519e1fa0a1e2aa5b 100644
--- a/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_it.properties
+++ b/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_it.properties
@@ -14,8 +14,8 @@ stat.table.header.day6=venerd\u00EC
 stat.table.header.day7=sabato
 stat.table.header.node=Elemento di corso
 stat.table.header.total=Totale
-statistic.chart.intro=Questa grafica mostra tutti i clic {0} sulla base di tutti i dati disponibili (dal {1}) per giorno.
+statistic.chart.intro=Questa grafica mostra tutti i clic {0} sulla base di tutti i dati disponibili per giorno.
 statistic.chart.pernode.intro=Questa grafica mostra i clic sugli elementi di corso il {0}.
 statistic.chart.pernode.total.intro=Questa grafica mostra tutti i clic sugli elementi di corso durante il periodo stabilito.
-statistic.intro=Questa grafica mostra tutti i clic sugli elementi di corso sulla base di tutti i dati disponibili (dal {0}) per giorno.
+statistic.intro=Questa grafica mostra tutti i clic sugli elementi di corso sulla base di tutti i dati disponibili per giorno.
 statistic.title=Statistica giornaliera
diff --git a/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_nl_NL.properties b/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_nl_NL.properties
index adb22efe1e38e28610d9eedc20e92f362e6f8100..7c56fafbbe7b28b2864662fdfb64516fd3bf4c16 100644
--- a/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_nl_NL.properties
+++ b/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_nl_NL.properties
@@ -14,8 +14,8 @@ stat.table.header.day6=Vrijdag
 stat.table.header.day7=Zaterdag
 stat.table.header.node=Cursuselement
 stat.table.header.total=Totaal
-statistic.chart.intro=Deze grafiek toont alle toegangen {0} gebaseerd op de volledige cursusdata die beschikbaar is (sinds (1)) per dag.
+statistic.chart.intro=Deze grafiek toont alle toegangen {0} gebaseerd op de volledige cursusdata die beschikbaar is per dag.
 statistic.chart.pernode.intro=Deze grafiek toont alle toegangen tot cursuselementen op {0}.
 statistic.chart.pernode.total.intro=Deze grafiek toont alle toegangen tot cursuselementen tijdens de geselecteerde tijdsperiode.
-statistic.intro=Deze statistiek toont alle toegangen tot cursuselementen gebaseerd op de volledige cursusdata beschikbaar (sinds {0} per dag.
+statistic.intro=Deze statistiek toont alle toegangen tot cursuselementen gebaseerd op de volledige cursusdata beschikbaar per dag.
 statistic.title=Dagelijkse statistieken
diff --git a/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_pl.properties b/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_pl.properties
index d00ece480f12549d3a676143778dd054bfc69887..e72466a950634e3a27d8bece28ed4fc82b19a91c 100644
--- a/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_pl.properties
+++ b/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_pl.properties
@@ -12,8 +12,8 @@ stat.table.header.day6=Pi\u0105tek
 stat.table.header.day7=Sobota
 stat.table.header.node=Element kursu
 stat.table.header.total=Razem
-statistic.chart.intro=Ten wykres przedstawia wszystkie dzienne zapytania {0}, bazuj\u0105ce na wszystkich dost\u0119pnych danych dla kursu (od {1}).
+statistic.chart.intro=Ten wykres przedstawia wszystkie dzienne zapytania {0}, bazuj\u0105ce na wszystkich dost\u0119pnych danych dla kursu.
 statistic.chart.pernode.intro=Ten wykres przedstawia wszystkie zapytania dla elementu kursu {0}.
 statistic.chart.pernode.total.intro=Ten wykres przedstawia wszystkie zapytania dla element\u00F3w kursu, przez ca\u0142y wybrany okres.
-statistic.intro=Ten wykres przedstawia wszystkie zapytania dzienne, bazuj\u0105ce na wszystkich danych, dost\u0119pnych dla kursu (od {0}).
+statistic.intro=Ten wykres przedstawia wszystkie zapytania dzienne, bazuj\u0105ce na wszystkich danych, dost\u0119pnych dla kursu.
 statistic.title=Statystyki dzienne
diff --git a/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_pt_BR.properties
index f91f5b57e618f9ca72551d889dcc56362ac70e98..9f23aa5ec161d94556191cd7bb1a1137da8fab3b 100644
--- a/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_pt_BR.properties
@@ -14,8 +14,8 @@ stat.table.header.day6=Sexta-Feira
 stat.table.header.day7=S\u00E1bado
 stat.table.header.node=Elemento de Curso
 stat.table.header.total=Total
-statistic.chart.intro=Este gr\u00E1fico mostra todos os acessos {0} baseados em todos os dados de curso dispon\u00EDveis (desde {1}) por dia.
+statistic.chart.intro=Este gr\u00E1fico mostra todos os acessos {0} baseados em todos os dados de curso dispon\u00EDveis por dia.
 statistic.chart.pernode.intro=Este gr\u00E1fico mostra todos os acessos aos elementos do curso em {0}.
 statistic.chart.pernode.total.intro=Este gr\u00E1fico mostra todos os acessos aos elementos do curso, durante o per\u00EDodo de tempo selecionado.
-statistic.intro=Esta estat\u00EDstica mostra todos os acessos aos elementos de curso com base em todos os dados dispon\u00EDveis (desde {0}) por dia.
+statistic.intro=Esta estat\u00EDstica mostra todos os acessos aos elementos de curso com base em todos os dados dispon\u00EDveis por dia.
 statistic.title=Estat\u00EDsticas Di\u00E1rias
diff --git a/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_zh_CN.properties
index 009eb075b1b4f9b9642af642c700e0fdf1c423ca..5f5c5b29fe2953b10bb1a67c11fadc5990817c21 100644
--- a/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/course/statistic/daily/_i18n/LocalStrings_zh_CN.properties
@@ -14,8 +14,8 @@ stat.table.header.day6=\u5468\u4E94
 stat.table.header.day7=\u5468\u516D
 stat.table.header.node=\u5B66\u7A0B\u6A21\u5757
 stat.table.header.total=\u603B\u4F53
-statistic.chart.intro=\u6B64\u56FE\u50CF\u663E\u793A\u6240\u6709\u7684\u8981\u6C42{0},\u57FA\u4E8E\u6BCF\u5929\u6240\u6709\u6709\u4EF7\u503C\u7684\u6570\u636E(\u81EA\u4ECE{1})
+statistic.chart.intro=\u6B64\u56FE\u50CF\u663E\u793A\u6240\u6709\u7684\u8981\u6C42{0},\u57FA\u4E8E\u6BCF\u5929\u6240\u6709\u6709\u4EF7\u503C\u7684\u6570\u636E
 statistic.chart.pernode.intro=\u6B64\u56FE\u663E\u793A\u4E86\u5728{0}\u4E2D\u70B9\u51FB\u5B66\u7A0B\u5143\u7D20\u7684\u6B21\u6570\u3002
 statistic.chart.pernode.total.intro=\u6B64\u56FE\u6807\u663E\u793A\u4E86\u5728\u6307\u5B9A\u65F6\u95F4\u6BB5\u5185\u8BBF\u95EE\u5B66\u7A0B\u5143\u7D20\u7684\u6240\u6709\u8BB0\u5F55\u3002
-statistic.intro=\u57FA\u4E8E\u6240\u6709\u6709\u6548\u7684\u5B66\u7A0B\u6570\u636E\uFF0C\u6B64\u7EDF\u8BA1\u663E\u793A\u4E86\u5B66\u7A0B\u5143\u7D20\u6BCF\u5929\u6240\u6709\u7684\u8BBF\u95EE\u8BB0\u5F55{\u81EA\u4ECE{0}\u8D77\u6BCF\u5929\u7684\u8BB0\u5F55}\u3002
+statistic.intro=\u57FA\u4E8E\u6240\u6709\u6709\u6548\u7684\u5B66\u7A0B\u6570\u636E\uFF0C\u6B64\u7EDF\u8BA1\u663E\u793A\u4E86\u5B66\u7A0B\u5143\u7D20\u6BCF\u5929\u6240\u6709\u7684\u8BBF\u95EE\u8BB0\u5F55\u3002
 statistic.title=\u6BCF\u65E5\u7EDF\u8BA1
diff --git a/src/main/java/org/olat/course/statistic/dayofweek/DayOfWeekStatisticManager.java b/src/main/java/org/olat/course/statistic/dayofweek/DayOfWeekStatisticManager.java
index b153ec65606584bd340b407887ae0c1ae5bf0fc7..981b95eda1d6b2857f87b0d4a1ec6075f2e577d7 100644
--- a/src/main/java/org/olat/course/statistic/dayofweek/DayOfWeekStatisticManager.java
+++ b/src/main/java/org/olat/course/statistic/dayofweek/DayOfWeekStatisticManager.java
@@ -62,7 +62,7 @@ public class DayOfWeekStatisticManager implements IStatisticManager {
 		Calendar c = Calendar.getInstance(ureq.getLocale());
 		int firstDayOfWeek = c.getFirstDayOfWeek();
 		
-		List<String> columnHeaders = new ArrayList<String>(7);
+		List<String> columnHeaders = new ArrayList<>(7);
 		for(int i=firstDayOfWeek; i<firstDayOfWeek+7; i++) {
 			int mod = i%7;
 			if (mod==0) {
diff --git a/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_ar.properties b/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_ar.properties
index 6ee72b5565ebd5fa4f8a9fce5242f23bdb0bf769..6f75e7fc7b0871d577c9e33b72c43f59a3ccc71e 100644
--- a/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_ar.properties
+++ b/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_ar.properties
@@ -13,8 +13,8 @@ stat.table.header.day6=\u0627\u0644\u062C\u0645\u0639\u0629
 stat.table.header.day7=\u0627\u0644\u0633\u0628\u062A
 stat.table.header.node=\u0639\u0646\u0635\u0631 \u0627\u0644\u0645\u0642\u0631\u0631
 stat.table.header.total=\u0627\u0644\u0645\u062C\u0645\u0648\u0639
-statistic.chart.intro=\u064A\u0639\u0631\u0636 \u0647\u0630\u0627 \u0627\u0644\u0645\u062E\u0637\u0637 \u0643\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A {0} \u0628\u0646\u0627\u0621\u0627\u064B \u0639\u0644\u0649 \u0643\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0645\u062A\u0627\u062D\u0629 (\u0645\u0646\u0630 {1}) \u0644\u0643\u0644 \u0623\u064A\u0627\u0645 \u0627\u0644\u0623\u0633\u0628\u0648\u0639.
+statistic.chart.intro=\u064A\u0639\u0631\u0636 \u0647\u0630\u0627 \u0627\u0644\u0645\u062E\u0637\u0637 \u0643\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A {0} \u0628\u0646\u0627\u0621\u0627\u064B \u0639\u0644\u0649 \u0643\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0645\u062A\u0627\u062D\u0629 \u0644\u0643\u0644 \u0623\u064A\u0627\u0645 \u0627\u0644\u0623\u0633\u0628\u0648\u0639.
 statistic.chart.pernode.intro=.{0} \u064A\u0639\u0631\u0636 \u0647\u0630\u0627 \u0627\u0644\u0645\u062E\u0637\u0637 \u0643\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0644\u0639\u0646\u0627\u0635\u0631 \u0627\u0644\u0645\u0642\u0631\u0631 \u0641\u0649
-statistic.chart.pernode.total.intro={0} \u064A\u0639\u0631\u0636 \u0647\u0630\u0627 \u0627\u0644\u0645\u062E\u0637\u0637 \u0643\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0644\u0639\u0646\u0627\u0635\u0631 \u0627\u0644\u0645\u0642\u0631\u0631 \u0628\u0646\u0627\u0621\u0627\u064B \u0639\u0644\u0649 \u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0645\u0642\u0631\u0631 \u0627\u0644\u0645\u062A\u0627\u062D\u0629 (\u0645\u0646\u0630).
-statistic.intro=.\u064A\u0639\u0631\u0636 \u0647\u0630\u0627 \u0627\u0644\u0645\u062E\u0637\u0637 \u0643\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0644\u0639\u0646\u0627\u0635\u0631 \u0627\u0644\u0645\u0642\u0631\u0631 \u0628\u0646\u0627\u0621\u0627\u064B \u0639\u0644\u0649 \u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0645\u0642\u0631\u0631 \u0627\u0644\u0645\u062A\u0627\u062D\u0629 (\u0645\u0646\u0630 {0}) \u0644\u0643\u0644 \u0623\u064A\u0627\u0645 \u0627\u0644\u0623\u0633\u0628\u0648\u0639
+statistic.chart.pernode.total.intro=\u064A\u0639\u0631\u0636 \u0647\u0630\u0627 \u0627\u0644\u0645\u062E\u0637\u0637 \u0643\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0644\u0639\u0646\u0627\u0635\u0631 \u0627\u0644\u0645\u0642\u0631\u0631 \u0628\u0646\u0627\u0621\u0627\u064B \u0639\u0644\u0649 \u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0645\u0642\u0631\u0631 \u0627\u0644\u0645\u062A\u0627\u062D\u0629 (\u0645\u0646\u0630).
+statistic.intro=.\u064A\u0639\u0631\u0636 \u0647\u0630\u0627 \u0627\u0644\u0645\u062E\u0637\u0637 \u0643\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0644\u0639\u0646\u0627\u0635\u0631 \u0627\u0644\u0645\u0642\u0631\u0631 \u0628\u0646\u0627\u0621\u0627\u064B \u0639\u0644\u0649 \u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0645\u0642\u0631\u0631 \u0627\u0644\u0645\u062A\u0627\u062D\u0629 \u0644\u0643\u0644 \u0623\u064A\u0627\u0645 \u0627\u0644\u0623\u0633\u0628\u0648\u0639
 statistic.title=\u0627\u0644\u0625\u062D\u0635\u0627\u0626\u064A\u0627\u062A \u0644\u0643\u0644 \u0623\u064A\u0627\u0645 \u0627\u0644\u0623\u0633\u0628\u0648\u0639
diff --git a/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_de.properties
index 8b184375b0898d1a4d0ffa27d2cd2864d1001823..962c4b138ef8bdb4fd180605d7a25b18b80437df 100644
--- a/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_de.properties
@@ -2,10 +2,10 @@ menu.createstatfile=Pro Wochentag
 menu.createstatfile.alt=Statistik pro Wochentag anzeigen
 
 statistic.title=Statistik pro Wochentag
-statistic.intro=Diese Statistik zeigt alle Zugriffe auf die Kursbausteine basierend auf allen verf\u00FCgbaren Kursdaten (seit {0}) gruppiert pro Wochentag.
-statistic.chart.intro=Diese Grafik zeigt alle Zugriffe {0} basierend auf allen verf\u00FCgbaren Daten (seit {1}) des Kurses pro Wochentag.
+statistic.intro=Diese Statistik zeigt alle Zugriffe auf die Kursbausteine basierend auf allen verf\u00FCgbaren Kursdaten gruppiert pro Wochentag.
+statistic.chart.intro=Diese Grafik zeigt alle Zugriffe {0} basierend auf allen verf\u00FCgbaren Daten des Kurses pro Wochentag.
 statistic.chart.pernode.intro=Diese Grafik zeigt alle Zugriffe auf die Kursbausteine an einem {0}.
-statistic.chart.pernode.total.intro=Diese Grafik zeigt alle Zugriffe auf die Kursbausteine basierend auf allen verf\u00fcgbaren Kursdaten (seit {0}). 
+statistic.chart.pernode.total.intro=Diese Grafik zeigt alle Zugriffe auf die Kursbausteine basierend auf allen verf\u00fcgbaren Kursdaten. 
 
 
 stat.table.header.node=Kursbaustein
diff --git a/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_el.properties b/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_el.properties
index 2cef963dd6a7226dcfdbedebbb6134137ace8510..b45d62045ef70eca3a0d98261e382eb9f6dd8fe6 100644
--- a/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_el.properties
+++ b/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_el.properties
@@ -13,8 +13,8 @@ stat.table.header.day6=\u03A0\u03B1\u03C1\u03B1\u03C3\u03BA\u03B5\u03C5\u03AE
 stat.table.header.day7=\u03A3\u03AC\u03B2\u03B2\u03B1\u03C4\u03BF
 stat.table.header.node=\u03A3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03BF \u03BC\u03B1\u03B8\u03AE\u03BC\u03B1\u03C4\u03BF\u03C2
 stat.table.header.total=\u03A3\u03CD\u03BD\u03BF\u03BB\u03BF
-statistic.chart.intro=\u0391\u03C5\u03C4\u03CC \u03C4\u03BF \u03B4\u03B9\u03AC\u03B3\u03C1\u03B1\u03BC\u03BC\u03B1 \u03B4\u03B5\u03AF\u03C7\u03BD\u03B5\u03B9 \u03CC\u03BB\u03B5\u03C2 \u03C4\u03B9\u03C2 \u03C0\u03C1\u03BF\u03C3\u03B2\u03AC\u03C3\u03B5\u03B9\u03C2 {0} \u03C0\u03BF\u03C5 \u03B2\u03B1\u03C3\u03AF\u03B6\u03BF\u03BD\u03C4\u03B1\u03B9 \u03C3\u03B5 \u03CC\u03BB\u03B1 \u03C4\u03B1 \u03B4\u03B9\u03B1\u03B8\u03AD\u03C3\u03B9\u03BC\u03B1 \u03B4\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03B1 \u03BC\u03B1\u03B8\u03B7\u03BC\u03AC\u03C4\u03C9\u03BD (\u03B1\u03C0\u03CC \u03C4\u03B9\u03C2 {1}) \u03B1\u03BD\u03AC \u03B7\u03BC\u03AD\u03C1\u03B1 \u03B5\u03B2\u03B4\u03BF\u03BC\u03AC\u03B4\u03B1\u03C2.
+statistic.chart.intro=\u0391\u03C5\u03C4\u03CC \u03C4\u03BF \u03B4\u03B9\u03AC\u03B3\u03C1\u03B1\u03BC\u03BC\u03B1 \u03B4\u03B5\u03AF\u03C7\u03BD\u03B5\u03B9 \u03CC\u03BB\u03B5\u03C2 \u03C4\u03B9\u03C2 \u03C0\u03C1\u03BF\u03C3\u03B2\u03AC\u03C3\u03B5\u03B9\u03C2 {0} \u03C0\u03BF\u03C5 \u03B2\u03B1\u03C3\u03AF\u03B6\u03BF\u03BD\u03C4\u03B1\u03B9 \u03C3\u03B5 \u03CC\u03BB\u03B1 \u03C4\u03B1 \u03B4\u03B9\u03B1\u03B8\u03AD\u03C3\u03B9\u03BC\u03B1 \u03B4\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03B1 \u03BC\u03B1\u03B8\u03B7\u03BC\u03AC\u03C4\u03C9\u03BD \u03B1\u03BD\u03AC \u03B7\u03BC\u03AD\u03C1\u03B1 \u03B5\u03B2\u03B4\u03BF\u03BC\u03AC\u03B4\u03B1\u03C2.
 statistic.chart.pernode.intro=\u0391\u03C5\u03C4\u03CC \u03C4\u03BF \u03B4\u03B9\u03AC\u03B3\u03C1\u03B1\u03BC\u03BC\u03B1 \u03B5\u03BC\u03C6\u03B1\u03BD\u03AF\u03B6\u03B5\u03B9 \u03CC\u03BB\u03B5\u03C2 \u03C4\u03B9\u03C2 \u03C0\u03C1\u03BF\u03C3\u03B2\u03AC\u03C3\u03B5\u03B9\u03C2 \u03C3\u03B5 \u03C3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03B1 \u03BC\u03B1\u03B8\u03B7\u03BC\u03AC\u03C4\u03C9\u03BD \u03C3\u03B5 \u03AD\u03BD\u03B1 {0}.
-statistic.chart.pernode.total.intro=\u0391\u03C5\u03C4\u03CC \u03C4\u03BF \u03B4\u03B9\u03AC\u03B3\u03C1\u03B1\u03BC\u03BC\u03B1 \u03B4\u03B5\u03AF\u03C7\u03BD\u03B5\u03B9 \u03CC\u03BB\u03B5\u03C2 \u03C4\u03B9\u03C2 \u03C0\u03C1\u03BF\u03C3\u03B2\u03AC\u03C3\u03B5\u03B9\u03C2 \u03C3\u03B5 \u03C3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03B1 \u03BC\u03B1\u03B8\u03B7\u03BC\u03AC\u03C4\u03C9\u03BD \u03C0\u03BF\u03C5 \u03B2\u03B1\u03C3\u03AF\u03B6\u03BF\u03BD\u03C4\u03B1\u03B9 \u03C3\u03B5 \u03CC\u03BB\u03B1 \u03C4\u03B1 \u03B4\u03B9\u03B1\u03B8\u03AD\u03C3\u03B9\u03BC\u03B1 \u03B4\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03B1 (\u03B1\u03C0\u03CC \u03C4\u03B9\u03C2 {0}).
-statistic.intro=\u0391\u03C5\u03C4\u03AE \u03B7 \u03C3\u03C4\u03B1\u03C4\u03B9\u03C3\u03C4\u03B9\u03BA\u03AE \u03B4\u03B5\u03AF\u03C7\u03BD\u03B5\u03B9 \u03CC\u03BB\u03B5\u03C2 \u03C4\u03B9\u03C2 \u03C0\u03C1\u03BF\u03C3\u03B2\u03AC\u03C3\u03B5\u03B9\u03C2 \u03C3\u03B5 \u03C3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03B1 \u03BC\u03B1\u03B8\u03B7\u03BC\u03AC\u03C4\u03C9\u03BD \u03C0\u03BF\u03C5 \u03B2\u03B1\u03C3\u03AF\u03B6\u03BF\u03BD\u03C4\u03B1\u03B9 \u03C3\u03B5 \u03BB\u03B9\u03BA\u03B1 \u03C4\u03B1 \u03B4\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03B1 \u03BC\u03B1\u03B8\u03B7\u03BC\u03AC\u03C4\u03C9\u03BD \u03C0\u03BF\u03C5 \u03B5\u03AF\u03BD\u03B1\u03B9 \u03B4\u03B9\u03B1\u03B8\u03AD\u03C3\u03B9\u03BC\u03B1 (\u03B1\u03C0\u03CC \u03C4\u03B9\u03C2 {0}) \u03B1\u03BD\u03AC \u03B7\u03BC\u03AD\u03C1\u03B1 \u03B5\u03B2\u03B4\u03BF\u03BC\u03AC\u03B4\u03B1\u03C2.
+statistic.chart.pernode.total.intro=\u0391\u03C5\u03C4\u03CC \u03C4\u03BF \u03B4\u03B9\u03AC\u03B3\u03C1\u03B1\u03BC\u03BC\u03B1 \u03B4\u03B5\u03AF\u03C7\u03BD\u03B5\u03B9 \u03CC\u03BB\u03B5\u03C2 \u03C4\u03B9\u03C2 \u03C0\u03C1\u03BF\u03C3\u03B2\u03AC\u03C3\u03B5\u03B9\u03C2 \u03C3\u03B5 \u03C3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03B1 \u03BC\u03B1\u03B8\u03B7\u03BC\u03AC\u03C4\u03C9\u03BD \u03C0\u03BF\u03C5 \u03B2\u03B1\u03C3\u03AF\u03B6\u03BF\u03BD\u03C4\u03B1\u03B9 \u03C3\u03B5 \u03CC\u03BB\u03B1 \u03C4\u03B1 \u03B4\u03B9\u03B1\u03B8\u03AD\u03C3\u03B9\u03BC\u03B1 \u03B4\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03B1.
+statistic.intro=\u0391\u03C5\u03C4\u03AE \u03B7 \u03C3\u03C4\u03B1\u03C4\u03B9\u03C3\u03C4\u03B9\u03BA\u03AE \u03B4\u03B5\u03AF\u03C7\u03BD\u03B5\u03B9 \u03CC\u03BB\u03B5\u03C2 \u03C4\u03B9\u03C2 \u03C0\u03C1\u03BF\u03C3\u03B2\u03AC\u03C3\u03B5\u03B9\u03C2 \u03C3\u03B5 \u03C3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03B1 \u03BC\u03B1\u03B8\u03B7\u03BC\u03AC\u03C4\u03C9\u03BD \u03C0\u03BF\u03C5 \u03B2\u03B1\u03C3\u03AF\u03B6\u03BF\u03BD\u03C4\u03B1\u03B9 \u03C3\u03B5 \u03BB\u03B9\u03BA\u03B1 \u03C4\u03B1 \u03B4\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03B1 \u03BC\u03B1\u03B8\u03B7\u03BC\u03AC\u03C4\u03C9\u03BD \u03C0\u03BF\u03C5 \u03B5\u03AF\u03BD\u03B1\u03B9 \u03B4\u03B9\u03B1\u03B8\u03AD\u03C3\u03B9\u03BC\u03B1 \u03B1\u03BD\u03AC \u03B7\u03BC\u03AD\u03C1\u03B1 \u03B5\u03B2\u03B4\u03BF\u03BC\u03AC\u03B4\u03B1\u03C2.
 statistic.title=\u03A3\u03C4\u03B1\u03C4\u03B9\u03C3\u03C4\u03B9\u03BA\u03AC \u03B1\u03BD\u03AC \u03B7\u03BC\u03AD\u03C1\u03B1 \u03B5\u03B2\u03B4\u03BF\u03BC\u03AC\u03B4\u03B1\u03C2
diff --git a/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_en.properties
index 90ec7aa3983d786b7a131cf40b925f7b9d7207e4..14947f47e63c4d39de94a45b975411850d800ce2 100644
--- a/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_en.properties
@@ -13,8 +13,8 @@ stat.table.header.day6=Friday
 stat.table.header.day7=Saturday
 stat.table.header.node=Course element
 stat.table.header.total=Total
-statistic.chart.intro=This chart shows all accesses {0} based on the entire course data available (since {1}) per weekday.
+statistic.chart.intro=This chart shows all accesses {0} based on the entire course data available per weekday.
 statistic.chart.pernode.intro=This chart shows all accesses to course elements on a {0}.
-statistic.chart.pernode.total.intro=This chart shows all accesses to course elements based on the entire course data available (since {0}).
-statistic.intro=This statistic shows all accesses to course elements based on the entire course data available (since {0}) sorted per weekday.
+statistic.chart.pernode.total.intro=This chart shows all accesses to course elements based on the entire course data available.
+statistic.intro=This statistic shows all accesses to course elements based on the entire course data available sorted per weekday.
 statistic.title=Statistics per weekday
diff --git a/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_fr.properties
index 04ad40153937cb7880d5477bee6ff241757111a1..f7e3b1b8fb58f91b056f4fa455f8134dbb683509 100644
--- a/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_fr.properties
@@ -13,8 +13,8 @@ stat.table.header.day6=Vendredi
 stat.table.header.day7=Samedi
 stat.table.header.node=\u00E9l\u00E9ment de cours
 stat.table.header.total=total
-statistic.chart.intro=Ce graphique montre tous les acc\u00E8s {0} bas\u00E9 sur toutes les donn\u00E9es disponibles (depuis {1}) du cours par jour ouvrable.
+statistic.chart.intro=Ce graphique montre tous les acc\u00E8s {0} bas\u00E9 sur toutes les donn\u00E9es disponibles du cours par jour ouvrable.
 statistic.chart.pernode.intro=Ce graphique montre tous les acc\u00E8s sur les \u00E9l\u00E9ments de cours {0}.
-statistic.chart.pernode.total.intro=Ce graphique montre tous les acc\u00E8s sur les \u00E9l\u00E9ments de cours bas\u00E9 sur toutes les donn\u00E9es disponibles (depuis {0}).
-statistic.intro=Ces statistiques montrent tous les acc\u00E8s sur les \u00E9l\u00E9ments de cours bas\u00E9 sur toutes les donn\u00E9es disponibles (depuis {0}) par jour de semaine.
+statistic.chart.pernode.total.intro=Ce graphique montre tous les acc\u00E8s sur les \u00E9l\u00E9ments de cours bas\u00E9 sur toutes les donn\u00E9es disponibles.
+statistic.intro=Ces statistiques montrent tous les acc\u00E8s sur les \u00E9l\u00E9ments de cours bas\u00E9 sur toutes les donn\u00E9es disponibles par jour de semaine.
 statistic.title=Statistiques par jour de semaine
diff --git a/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_it.properties
index 15ea46e47afcfc9f3ccc005c3edcd7416503c0f6..33b0e562f6ac3d6b942b1b5f6506d90e6a851e67 100644
--- a/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_it.properties
+++ b/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_it.properties
@@ -13,8 +13,8 @@ stat.table.header.day6=venerd\u00EC
 stat.table.header.day7=sabato
 stat.table.header.node=Elemento di corso
 stat.table.header.total=Totale
-statistic.chart.intro=Questa grafica mostra tutti i clic {0} sulla base di tutti i dati disponibili del corso (dal {1}) per giorno della settimana.
+statistic.chart.intro=Questa grafica mostra tutti i clic {0} sulla base di tutti i dati disponibili del corso per giorno della settimana.
 statistic.chart.pernode.intro=Questa grafica mostra tutti i clic sugli elementi di corso per un/una {0}.
-statistic.chart.pernode.total.intro=Questa grafica mostra tutti i clic sugli elementi di corso sulla base di tutti i dati disponibili del corso (dal {0}).
-statistic.intro=Questa grafica mostra tutti i clic sugli elementi di corso sulla base di tutti i dati disponibili del corso (dal {0}) per giorno della settimana.
+statistic.chart.pernode.total.intro=Questa grafica mostra tutti i clic sugli elementi di corso sulla base di tutti i dati disponibili del corso.
+statistic.intro=Questa grafica mostra tutti i clic sugli elementi di corso sulla base di tutti i dati disponibili del corso per giorno della settimana.
 statistic.title=Statistica per giorno della settimana
diff --git a/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_jp.properties b/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_jp.properties
index c65211400dbf4d617153c8dc494493e34af189f7..ffa2995b8ffeeb506ce1d0d73d191fceab80e206 100644
--- a/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_jp.properties
+++ b/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_jp.properties
@@ -13,8 +13,8 @@ stat.table.header.day6=\u91D1\u66DC\u65E5
 stat.table.header.day7=\u571F\u66DC\u65E5
 stat.table.header.node=\u30B3\u30FC\u30B9\u30A8\u30EC\u30E1\u30F3\u30C8
 stat.table.header.total=\u5408\u8A08
-statistic.chart.intro=\u3053\u306E\u30C1\u30E3\u30FC\u30C8\u3067\u306F ({1} \u4EE5\u6765) \u5229\u7528\u53EF\u80FD\u306A\u3059\u3079\u3066\u306E\u30B3\u30FC\u30B9\u30C7\u30FC\u30BF\u306B\u57FA\u3065\u304D\u3001 {0} \u3078\u306E\u30A2\u30AF\u30BB\u30B9\u3059\u3079\u3066\u3092\u9031\u3054\u3068\u306B\u8868\u793A\u3057\u307E\u3059\u3002
+statistic.chart.intro=\u3053\u306E\u30C1\u30E3\u30FC\u30C8\u3067\u306F \u5229\u7528\u53EF\u80FD\u306A\u3059\u3079\u3066\u306E\u30B3\u30FC\u30B9\u30C7\u30FC\u30BF\u306B\u57FA\u3065\u304D\u3001 {0} \u3078\u306E\u30A2\u30AF\u30BB\u30B9\u3059\u3079\u3066\u3092\u9031\u3054\u3068\u306B\u8868\u793A\u3057\u307E\u3059\u3002
 statistic.chart.pernode.intro=\u3053\u306E\u30C1\u30E3\u30FC\u30C8\u306F\u30B3\u30FC\u30B9\u30A8\u30EC\u30E1\u30F3\u30C8\u306B\u5BFE\u3059\u308B {0}\u3000\u306E\u3059\u3079\u3066\u306E\u30A2\u30AF\u30BB\u30B9\u3092\u8868\u793A\u3057\u307E\u3059\u3002
-statistic.chart.pernode.total.intro=\u3053\u306E\u30C1\u30E3\u30FC\u30C8\u306F ({0} \u4EE5\u6765\u306E) \u5229\u7528\u53EF\u80FD\u306A\u3059\u3079\u3066\u306E\u30B3\u30FC\u30B9\u30C7\u30FC\u30BF\u3092\u57FA\u306B\u3001\u30B3\u30FC\u30B9\u30A8\u30EC\u30E1\u30F3\u30C8\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30A2\u30AF\u30BB\u30B9\u3092\u8868\u793A\u3057\u307E\u3059\u3002
-statistic.intro=\u3053\u306E\u7D71\u8A08\u306F ({0} \u4EE5\u6765\u306E) \u5E73\u65E51\u65E5\u3042\u305F\u308A\u306E\u5229\u7528\u53EF\u80FD\u306A\u3059\u3079\u3066\u306E\u30B3\u30FC\u30B9\u30C7\u30FC\u30BF\u3092\u57FA\u306B\u3001\u30B3\u30FC\u30B9\u30A8\u30EC\u30E1\u30F3\u30C8\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30A2\u30AF\u30BB\u30B9\u3092\u8868\u793A\u3057\u307E\u3059\u3002
+statistic.chart.pernode.total.intro=\u3053\u306E\u30C1\u30E3\u30FC\u30C8\u306F \u5229\u7528\u53EF\u80FD\u306A\u3059\u3079\u3066\u306E\u30B3\u30FC\u30B9\u30C7\u30FC\u30BF\u3092\u57FA\u306B\u3001\u30B3\u30FC\u30B9\u30A8\u30EC\u30E1\u30F3\u30C8\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30A2\u30AF\u30BB\u30B9\u3092\u8868\u793A\u3057\u307E\u3059\u3002
+statistic.intro=\u3053\u306E\u7D71\u8A08\u306F \u5E73\u65E51\u65E5\u3042\u305F\u308A\u306E\u5229\u7528\u53EF\u80FD\u306A\u3059\u3079\u3066\u306E\u30B3\u30FC\u30B9\u30C7\u30FC\u30BF\u3092\u57FA\u306B\u3001\u30B3\u30FC\u30B9\u30A8\u30EC\u30E1\u30F3\u30C8\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30A2\u30AF\u30BB\u30B9\u3092\u8868\u793A\u3057\u307E\u3059\u3002
 statistic.title=\u5E73\u65E51\u65E5\u3042\u305F\u308A\u306E\u7D71\u8A08
diff --git a/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_nl_NL.properties b/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_nl_NL.properties
index bc723cb47c16e0dd0efda28c51f9c800920871c3..111811df7f3925f084bbfaecf2bd5f174a68c63e 100644
--- a/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_nl_NL.properties
+++ b/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_nl_NL.properties
@@ -13,8 +13,8 @@ stat.table.header.day6=Vrijdag
 stat.table.header.day7=Zaterdag
 stat.table.header.node=Cursuselement
 stat.table.header.total=Totaal
-statistic.chart.intro=Deze grafiek toont alle toegangen {0} gebaseerd op de volledige cursusdata beschikbaar (sinds {1}) per weekdag.
+statistic.chart.intro=Deze grafiek toont alle toegangen {0} gebaseerd op de volledige cursusdata beschikbaar per weekdag.
 statistic.chart.pernode.intro=Deze grafiek toont alle toegangen tot cursuselementen op een {0}.
-statistic.chart.pernode.total.intro=Deze grafiek toont alle toegangen tot cursuselementen gebaseerd op de volledige beschikbare cursusdata (since {0}).
-statistic.intro=Deze statistiek toont alle toegangen tot cursuselementen gebaseerd op de volledige cursusdata beschikbaar (sinds {0}) per weekdag.
+statistic.chart.pernode.total.intro=Deze grafiek toont alle toegangen tot cursuselementen gebaseerd op de volledige beschikbare cursusdata.
+statistic.intro=Deze statistiek toont alle toegangen tot cursuselementen gebaseerd op de volledige cursusdata beschikbaar per weekdag.
 statistic.title=Statistieken per weekdag
diff --git a/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_pl.properties b/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_pl.properties
index 6b936c6252dd9824e4ddfe04124d32cc5a7ef51e..665d75ef52e9bf99dc66a3f31cba3126f0cde5d3 100644
--- a/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_pl.properties
+++ b/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_pl.properties
@@ -11,8 +11,8 @@ stat.table.header.day6=Pi\u0105tek
 stat.table.header.day7=Sobota
 stat.table.header.node=Element kursu
 stat.table.header.total=Og\u00F3\u0142em
-statistic.chart.intro=Ten wykres przedstawia wszystkie zapytania {0} na podstawie wszystkich danych dost\u0119pnych w kursie (od {1}), w zale\u017Cno\u015Bci od dnia tygodnia.
+statistic.chart.intro=Ten wykres przedstawia wszystkie zapytania {0} na podstawie wszystkich danych dost\u0119pnych w kursie, w zale\u017Cno\u015Bci od dnia tygodnia.
 statistic.chart.pernode.intro=Ten wykres przedstawia wszystkie zapytania do element\u00F3w kursu w {0}.
-statistic.chart.pernode.total.intro=Ten wykres przedstawia wszystkie zapytania do element\u00F3w kursu, bazuj\u0105c na wszystkich dost\u0119pnych danych w kursie (od {0}).
-statistic.intro=Te statystyki przedstawiaj\u0105 wszystkie zapytania do element\u00F3w kursu, bazuj\u0105c na wszystkich dost\u0119pnych danych kursu (od {0}), w zale\u017Cno\u015Bci od dnia tygodnia.
+statistic.chart.pernode.total.intro=Ten wykres przedstawia wszystkie zapytania do element\u00F3w kursu, bazuj\u0105c na wszystkich dost\u0119pnych danych w kursie.
+statistic.intro=Te statystyki przedstawiaj\u0105 wszystkie zapytania do element\u00F3w kursu, bazuj\u0105c na wszystkich dost\u0119pnych danych kursu, w zale\u017Cno\u015Bci od dnia tygodnia.
 statistic.title=Statystyki dla dni tygodnia
diff --git a/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_pt_BR.properties
index d8ec619dc31380131ac7c66f357d5c64e84793ca..81a9f8beed2564a70ae5b1c6158f7ffe5c18542a 100644
--- a/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_pt_BR.properties
@@ -13,8 +13,8 @@ stat.table.header.day6=Sexta-Feira
 stat.table.header.day7=S\u00E1bado
 stat.table.header.node=Elemento do Curso
 stat.table.header.total=Total
-statistic.chart.intro=Este gr\u00E1fico mostra todos os acessos {0} com base em todos os dados do curso dispon\u00EDveis (desde {1}) por semana.
+statistic.chart.intro=Este gr\u00E1fico mostra todos os acessos {0} com base em todos os dados do curso dispon\u00EDveis por semana.
 statistic.chart.pernode.intro=Este gr\u00E1fico mostra todos os acessos a elementos do curso em um {0}.
-statistic.chart.pernode.total.intro=Este gr\u00E1fico mostra todos os acessos aos elementos do curso com base em todos os dados dispon\u00EDveis (desde {0}).
-statistic.intro=Esta estat\u00EDstica mostra todos os acessos aos elementos do curso com base em todos os dados dispon\u00EDveis (desde {0}) por semana.
+statistic.chart.pernode.total.intro=Este gr\u00E1fico mostra todos os acessos aos elementos do curso com base em todos os dados dispon\u00EDveis.
+statistic.intro=Esta estat\u00EDstica mostra todos os acessos aos elementos do curso com base em todos os dados dispon\u00EDveis por semana.
 statistic.title=Estat\u00EDsticas por semana
diff --git a/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_zh_CN.properties
index d74284078eba4defda2877fff396608fe31f2da4..a00411b5a238dd292f7ce596a5f85291cc9f1aa2 100644
--- a/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/course/statistic/dayofweek/_i18n/LocalStrings_zh_CN.properties
@@ -13,8 +13,8 @@ stat.table.header.day6=\u5468\u4E94
 stat.table.header.day7=\u5468\u516D
 stat.table.header.node=\u5B66\u7A0B\u5143\u7D20
 stat.table.header.total=\u603B\u5171
-statistic.chart.intro=\u57FA\u4E8E\u6240\u6709\u6709\u6548\u7684\u5B66\u7A0B\u6570\u636E\uFF0C\u6B64\u56FE\u8868\u663E\u793A\u4E86\u6BCF\u5468\u7684\u6240\u6709\u8BBF\u95EE\u8BB0\u5F55{0}{\u81EA\u4ECE{1}\u8D77}\u3002
+statistic.chart.intro=\u57FA\u4E8E\u6240\u6709\u6709\u6548\u7684\u5B66\u7A0B\u6570\u636E\uFF0C\u6B64\u56FE\u8868\u663E\u793A\u4E86\u6BCF\u5468\u7684\u6240\u6709\u8BBF\u95EE\u8BB0\u5F55{0}\u3002
 statistic.chart.pernode.intro=\u6B64\u56FE\u8868\u663E\u793A\u4E86\u5B66\u7A0B\u5143\u7D20\u5728{0}\u7684\u6240\u6709\u8BBF\u95EE\u8BB0\u5F55\u3002
-statistic.chart.pernode.total.intro=\u57FA\u4E8E\u6240\u6709\u6709\u6548\u7684\u5B66\u7A0B\u6570\u636E\uFF0C\u6B64\u56FE\u8868\u663E\u793A\u5B66\u7A0B\u5143\u7D20\u7684\u8BBF\u95EE\u8BB0\u5F55{\u81EA\u4ECE{0}\u8D77}\u3002
-statistic.intro=\u57FA\u4E8E\u6240\u6709\u6709\u6548\u7684\u5B66\u7A0B\u6570\u636E\uFF0C\u6B64\u7EDF\u8BA1\u663E\u793A\u4E86\u6BCF\u5468\u5B66\u7A0B\u7684\u6240\u6709\u8BBF\u95EE\u8BB0\u5F55(\u81EA\u4ECE{0}\u8D77)
+statistic.chart.pernode.total.intro=\u57FA\u4E8E\u6240\u6709\u6709\u6548\u7684\u5B66\u7A0B\u6570\u636E\uFF0C\u6B64\u56FE\u8868\u663E\u793A\u5B66\u7A0B\u5143\u7D20\u7684\u8BBF\u95EE\u8BB0\u5F55\u3002
+statistic.intro=\u57FA\u4E8E\u6240\u6709\u6709\u6548\u7684\u5B66\u7A0B\u6570\u636E\uFF0C\u6B64\u7EDF\u8BA1\u663E\u793A\u4E86\u6BCF\u5468\u5B66\u7A0B\u7684\u6240\u6709\u8BBF\u95EE\u8BB0\u5F55
 statistic.title=\u6309\u5468\u7EDF\u8BA1
diff --git a/src/main/java/org/olat/course/statistic/hourofday/HourOfDayStatisticManager.java b/src/main/java/org/olat/course/statistic/hourofday/HourOfDayStatisticManager.java
index a0230b6c2d9c4af0b74bf203b94a4d746925183d..5da4f631d8f7984968f49aa23712044a5dda9bb4 100644
--- a/src/main/java/org/olat/course/statistic/hourofday/HourOfDayStatisticManager.java
+++ b/src/main/java/org/olat/course/statistic/hourofday/HourOfDayStatisticManager.java
@@ -52,7 +52,7 @@ import org.olat.course.statistic.TotalAwareColumnDescriptor;
 public class HourOfDayStatisticManager implements IStatisticManager {
 
 	/** the logging object used in this class **/
-	private static final OLog log_ = Tracing.createLoggerFor(HourOfDayStatisticManager.class);
+	private static final OLog log = Tracing.createLoggerFor(HourOfDayStatisticManager.class);
 
 	@Override
 	public StatisticResult generateStatisticResult(UserRequest ureq, ICourse course, long courseRepositoryEntryKey) {
@@ -68,13 +68,13 @@ public class HourOfDayStatisticManager implements IStatisticManager {
 			try{
 				int start = Integer.parseInt(columnHeaders.get(0));
 				int end = Integer.parseInt(columnHeaders.get(columnHeaders.size()-1));
-				List<String> resultingColumnHeaders = new ArrayList<String>((end-start)+1);
+				List<String> resultingColumnHeaders = new ArrayList<>((end-start)+1);
 				for(int hour=start; hour<=end; hour++) {
 					resultingColumnHeaders.add(String.valueOf(hour));
 				}
 				statisticResult.setColumnHeaders(resultingColumnHeaders);
 			} catch(NumberFormatException nfe) {
-				log_.warn("generateStatisticResult: Got a NumberFormatException: "+nfe, nfe);
+				log.warn("generateStatisticResult: Got a NumberFormatException: "+nfe, nfe);
 			}
 		}
 		return statisticResult;
@@ -95,7 +95,7 @@ public class HourOfDayStatisticManager implements IStatisticManager {
 			DateFormat df = DateFormat.getTimeInstance(DateFormat.SHORT, ureq.getLocale());
 			hourOfDayLocaled = df.format(c.getTime());
 		} catch(RuntimeException re) {
-			re.printStackTrace(System.out);
+			log.error("", re);
 		}
 
 		TotalAwareColumnDescriptor cd = new TotalAwareColumnDescriptor(hourOfDayLocaled, column, 
diff --git a/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_ar.properties b/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_ar.properties
index 111d2c7a1446c455d09c11e579c4e02ee1d36dd6..d3698670b3af1f6831645a24d7b75eb95b46a620 100644
--- a/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_ar.properties
+++ b/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_ar.properties
@@ -6,8 +6,8 @@ menu.createstatfile=\u0644\u0643\u0644 \u0633\u0627\u0639\u0629
 menu.createstatfile.alt=\u0639\u0631\u0636 \u0627\u0644\u0625\u062D\u0635\u0627\u0626\u064A\u0627\u062A \u0644\u0643\u0644 \u0633\u0627\u0639\u0629
 stat.table.header.node=\u0639\u0646\u0635\u0631 \u0627\u0644\u0645\u0642\u0631\u0631
 stat.table.header.total=\u0627\u0644\u0645\u062C\u0645\u0648\u0639
-statistic.chart.intro=\u064A\u0639\u0631\u0636 \u0647\u0630\u0627 \u0627\u0644\u0645\u062E\u0637\u0637 \u0643\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A {0} \u0628\u0646\u0627\u0621\u0627\u064B \u0639\u0644\u0649 \u0643\u0644 \u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0645\u0642\u0631\u0631 \u0627\u0644\u0645\u062A\u0627\u062D\u0629 (\u0645\u0646\u0630 {1}) \u0644\u0643\u0644 \u0633\u0627\u0639\u0629.
+statistic.chart.intro=\u064A\u0639\u0631\u0636 \u0647\u0630\u0627 \u0627\u0644\u0645\u062E\u0637\u0637 \u0643\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A {0} \u0628\u0646\u0627\u0621\u0627\u064B \u0639\u0644\u0649 \u0643\u0644 \u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0645\u0642\u0631\u0631 \u0627\u0644\u0645\u062A\u0627\u062D\u0629 \u0644\u0643\u0644 \u0633\u0627\u0639\u0629.
 statistic.chart.pernode.intro=\u064A\u0639\u0631\u0636 \u0647\u0630\u0627 \u0627\u0644\u0645\u062E\u0637\u0637 \u0643\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0644\u0639\u0646\u0627\u0635\u0631 \u0627\u0644\u0645\u0642\u0631\u0631 \u0628\u062F\u0627\u064A\u0629 \u0645\u0646 {0} \u0644\u0643\u0644 \u0633\u0627\u0639\u0629.
-statistic.chart.pernode.total.intro=\u064A\u0639\u0631\u0636 \u0647\u0630\u0627 \u0627\u0644\u0645\u062E\u0637\u0637 \u0643\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0644\u0639\u0646\u0627\u0635\u0631 \u0627\u0644\u0645\u0642\u0631\u0631 \u0628\u0646\u0627\u0621\u0627\u064B \u0639\u0644\u0649 \u0643\u0644 \u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0645\u0642\u0631\u0631 \u0627\u0644\u0645\u062A\u0627\u062D\u0629 (\u0645\u0646\u0630 {0}) .
-statistic.intro=\u064A\u0639\u0631\u0636 \u0647\u0630\u0627 \u0627\u0644\u0645\u062E\u0637\u0637 \u0643\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0644\u0639\u0646\u0627\u0635\u0631 \u0627\u0644\u0645\u0642\u0631\u0631 \u0628\u0646\u0627\u0621\u0627\u064B \u0639\u0644\u0649 \u0643\u0644 \u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0645\u0642\u0631\u0631 \u0627\u0644\u0645\u062A\u0627\u062D\u0629 (\u0645\u0646\u0630 {0}) \u0644\u0643\u0644 \u0633\u0627\u0639\u0629.
+statistic.chart.pernode.total.intro=\u064A\u0639\u0631\u0636 \u0647\u0630\u0627 \u0627\u0644\u0645\u062E\u0637\u0637 \u0643\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0644\u0639\u0646\u0627\u0635\u0631 \u0627\u0644\u0645\u0642\u0631\u0631 \u0628\u0646\u0627\u0621\u0627\u064B \u0639\u0644\u0649 \u0643\u0644 \u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0645\u0642\u0631\u0631 \u0627\u0644\u0645\u062A\u0627\u062D\u0629.
+statistic.intro=\u064A\u0639\u0631\u0636 \u0647\u0630\u0627 \u0627\u0644\u0645\u062E\u0637\u0637 \u0643\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0644\u0639\u0646\u0627\u0635\u0631 \u0627\u0644\u0645\u0642\u0631\u0631 \u0628\u0646\u0627\u0621\u0627\u064B \u0639\u0644\u0649 \u0643\u0644 \u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0645\u0642\u0631\u0631 \u0627\u0644\u0645\u062A\u0627\u062D\u0629 \u0644\u0643\u0644 \u0633\u0627\u0639\u0629.
 statistic.title=\u0627\u0644\u0625\u062D\u0635\u0627\u0626\u064A\u0627\u062A \u0644\u0643\u0644 \u0633\u0627\u0639\u0629
diff --git a/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_de.properties
index c19f26dd89c4aaf9cd8f9f932e5bb5fce04cf232..8e748425c56ec766f45944a388879c8acf5912eb 100644
--- a/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_de.properties
@@ -2,10 +2,10 @@ menu.createstatfile=Pro Stunde
 menu.createstatfile.alt=Statistik pro Stunde anzeigen
 
 statistic.title=Statistik pro Stunde
-statistic.intro=Diese Statistik zeigt alle Zugriffe auf die Kursbausteinen basierend auf allen verf\u00FCgbaren Kursdaten (seit {0}) pro Stunde.<br/>Randstunden ohne verzeichnete Klicks werden in der Grafik nicht dargestellt.
-statistic.chart.intro=Diese Grafik zeigt alle Zugriffe {0} basierend auf allen verf\u00FCgbaren Kursdaten (seit {1}) pros Stunde.
+statistic.intro=Diese Statistik zeigt alle Zugriffe auf die Kursbausteinen basierend auf allen verf\u00FCgbaren Kursdaten pro Stunde.<br/>Randstunden ohne verzeichnete Klicks werden in der Grafik nicht dargestellt.
+statistic.chart.intro=Diese Grafik zeigt alle Zugriffe {0} basierend auf allen verf\u00FCgbaren Kursdaten pros Stunde.
 statistic.chart.pernode.intro=Diese Grafik zeigt alle Zugriffe auf die Kursbausteine in der Stunde ab {0}.
-statistic.chart.pernode.total.intro=Diese Grafik zeigt alle Zugriffe auf die Kursbausteine basierend auf allen verf\u00fcgbaren Kursdaten (seit {0}).
+statistic.chart.pernode.total.intro=Diese Grafik zeigt alle Zugriffe auf die Kursbausteine basierend auf allen verf\u00fcgbaren Kursdaten.
 
 
 stat.table.header.node=Kursbaustein
diff --git a/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_el.properties b/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_el.properties
index c6397359938f694c21c7fe77d019ce0d71650f6a..ee5a4e19822b8c4b1a4eb78100a634c6009dfccd 100644
--- a/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_el.properties
+++ b/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_el.properties
@@ -6,8 +6,8 @@ menu.createstatfile=\u0391\u03BD\u03AC \u03CE\u03C1\u03B1
 menu.createstatfile.alt=\u03A0\u03C1\u03BF\u03B2\u03BF\u03BB\u03AE \u03C3\u03C4\u03B1\u03C4\u03B9\u03C3\u03C4\u03B9\u03BA\u03CE\u03BD \u03B1\u03BD\u03AC \u03CE\u03C1\u03B1
 stat.table.header.node=\u03A3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03BF \u03BC\u03B1\u03B8\u03AE\u03BC\u03B1\u03C4\u03BF\u03C2
 stat.table.header.total=\u03A3\u03CD\u03BD\u03BF\u03BB\u03BF
-statistic.chart.intro=\u0391\u03C5\u03C4\u03CC \u03C4\u03BF \u03B4\u03B9\u03AC\u03B3\u03C1\u03B1\u03BC\u03BC\u03B1 \u03B4\u03B5\u03AF\u03C7\u03BD\u03B5\u03B9 \u03CC\u03BB\u03B5\u03C2 \u03C4\u03B9\u03C2 \u03C0\u03C1\u03BF\u03C3\u03B2\u03AC\u03C3\u03B5\u03B9\u03C2 {0} \u03C0\u03BF\u03C5 \u03B2\u03B1\u03C3\u03B9\u03B6\u03BF\u03BD\u03C4\u03B1\u03B9 \u03C3\u03B5 \u03CC\u03BB\u03B1 \u03C4\u03B1 \u03B4\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03B1 \u03BC\u03B1\u03B8\u03B7\u03BC\u03AC\u03C4\u03C9\u03BD \u03C0\u03BF\u03C5 \u03B5\u03AF\u03BD\u03B1\u03B9 \u03B4\u03B9\u03B1\u03B8\u03AD\u03C3\u03B9\u03BC\u03B1 (\u03B1\u03C0\u03CC \u03C4\u03B9\u03C2 {1}) \u03B1\u03BD\u03AC \u03CE\u03C1\u03B1.
+statistic.chart.intro=\u0391\u03C5\u03C4\u03CC \u03C4\u03BF \u03B4\u03B9\u03AC\u03B3\u03C1\u03B1\u03BC\u03BC\u03B1 \u03B4\u03B5\u03AF\u03C7\u03BD\u03B5\u03B9 \u03CC\u03BB\u03B5\u03C2 \u03C4\u03B9\u03C2 \u03C0\u03C1\u03BF\u03C3\u03B2\u03AC\u03C3\u03B5\u03B9\u03C2 {0} \u03C0\u03BF\u03C5 \u03B2\u03B1\u03C3\u03B9\u03B6\u03BF\u03BD\u03C4\u03B1\u03B9 \u03C3\u03B5 \u03CC\u03BB\u03B1 \u03C4\u03B1 \u03B4\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03B1 \u03BC\u03B1\u03B8\u03B7\u03BC\u03AC\u03C4\u03C9\u03BD \u03C0\u03BF\u03C5 \u03B5\u03AF\u03BD\u03B1\u03B9 \u03B4\u03B9\u03B1\u03B8\u03AD\u03C3\u03B9\u03BC\u03B1 \u03B1\u03BD\u03AC \u03CE\u03C1\u03B1.
 statistic.chart.pernode.intro=\u0391\u03C5\u03C4\u03CC \u03C4\u03BF \u03B4\u03B9\u03AC\u03B3\u03C1\u03B1\u03BC\u03BC\u03B1 \u03B4\u03B5\u03AF\u03C7\u03BD\u03B5\u03B9 \u03CC\u03BB\u03B5\u03C2 \u03C4\u03B9\u03C2 \u03C0\u03C1\u03BF\u03C3\u03B2\u03AC\u03C3\u03B5\u03B9\u03C2 \u03C3\u03B5 \u03C3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03B1 \u03BC\u03B1\u03B8\u03B7\u03BC\u03AC\u03C4\u03C9\u03BD \u03BE\u03B5\u03BA\u03B9\u03BD\u03CE\u03BD\u03C4\u03B1\u03C2 \u03B1\u03C0\u03CC {0} \u03B1\u03BD\u03AC \u03CE\u03C1\u03B1.
-statistic.chart.pernode.total.intro=\u0391\u03C5\u03C4\u03CC \u03C4\u03BF \u03B4\u03B9\u03AC\u03B3\u03C1\u03B1\u03BC\u03BC\u03B1 \u03B4\u03B5\u03AF\u03C7\u03BD\u03B5\u03B9 \u03CC\u03BB\u03B5\u03C2 \u03C4\u03B9\u03C2 \u03C0\u03C1\u03BF\u03C3\u03B2\u03AC\u03C3\u03B5\u03B9\u03C2 \u03C3\u03B5 \u03C3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03B1 \u03BC\u03B1\u03B8\u03B7\u03BC\u03AC\u03C4\u03C9\u03BD \u03C0\u03BF\u03C5 \u03B2\u03B1\u03C3\u03AF\u03B6\u03BF\u03BD\u03C4\u03B1\u03B9 \u03C3\u03B5 \u03CC\u03BB\u03B1 \u03C4\u03B1 \u03B4\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03B1 \u03BC\u03B1\u03B8\u03B7\u03BC\u03AC\u03C4\u03C9\u03BD \u03C0\u03BF\u03C5 \u03B5\u03AF\u03BD\u03B1\u03B9 \u03B4\u03B9\u03B1\u03B8\u03AD\u03C3\u03B9\u03BC\u03B1 (\u03B1\u03C0\u03CC \u03C4\u03B9\u03C2 {0}).
-statistic.intro=\u0391\u03C5\u03C4\u03AE \u03B7 \u03C3\u03C4\u03B1\u03C4\u03B9\u03C3\u03C4\u03B9\u03BA\u03AE \u03B4\u03B5\u03AF\u03C7\u03BD\u03B5\u03B9 \u03CC\u03BB\u03B5\u03C2 \u03C4\u03B9\u03C2 \u03C0\u03C1\u03BF\u03C3\u03B2\u03AC\u03C3\u03B5\u03B9\u03C2 \u03C3\u03B5 \u03C3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03B1 \u03BC\u03B1\u03B8\u03B7\u03BC\u03AC\u03C4\u03C9\u03BD \u03C0\u03BF\u03C5 \u03B2\u03B1\u03C3\u03AF\u03B6\u03BF\u03BD\u03C4\u03B1\u03B9 \u03C3\u03B5 \u03CC\u03BB\u03B1 \u03C4\u03B1 \u03B4\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03B1 \u03BC\u03B1\u03B8\u03B7\u03BC\u03AC\u03C4\u03C9\u03BD (\u03B1\u03C0\u03CC \u03C4\u03B9\u03C2 {0}) \u03B1\u03BD\u03AC \u03CE\u03C1\u03B1.
+statistic.chart.pernode.total.intro=\u0391\u03C5\u03C4\u03CC \u03C4\u03BF \u03B4\u03B9\u03AC\u03B3\u03C1\u03B1\u03BC\u03BC\u03B1 \u03B4\u03B5\u03AF\u03C7\u03BD\u03B5\u03B9 \u03CC\u03BB\u03B5\u03C2 \u03C4\u03B9\u03C2 \u03C0\u03C1\u03BF\u03C3\u03B2\u03AC\u03C3\u03B5\u03B9\u03C2 \u03C3\u03B5 \u03C3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03B1 \u03BC\u03B1\u03B8\u03B7\u03BC\u03AC\u03C4\u03C9\u03BD \u03C0\u03BF\u03C5 \u03B2\u03B1\u03C3\u03AF\u03B6\u03BF\u03BD\u03C4\u03B1\u03B9 \u03C3\u03B5 \u03CC\u03BB\u03B1 \u03C4\u03B1 \u03B4\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03B1 \u03BC\u03B1\u03B8\u03B7\u03BC\u03AC\u03C4\u03C9\u03BD \u03C0\u03BF\u03C5 \u03B5\u03AF\u03BD\u03B1\u03B9 \u03B4\u03B9\u03B1\u03B8\u03AD\u03C3\u03B9\u03BC\u03B1.
+statistic.intro=\u0391\u03C5\u03C4\u03AE \u03B7 \u03C3\u03C4\u03B1\u03C4\u03B9\u03C3\u03C4\u03B9\u03BA\u03AE \u03B4\u03B5\u03AF\u03C7\u03BD\u03B5\u03B9 \u03CC\u03BB\u03B5\u03C2 \u03C4\u03B9\u03C2 \u03C0\u03C1\u03BF\u03C3\u03B2\u03AC\u03C3\u03B5\u03B9\u03C2 \u03C3\u03B5 \u03C3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03B1 \u03BC\u03B1\u03B8\u03B7\u03BC\u03AC\u03C4\u03C9\u03BD \u03C0\u03BF\u03C5 \u03B2\u03B1\u03C3\u03AF\u03B6\u03BF\u03BD\u03C4\u03B1\u03B9 \u03C3\u03B5 \u03CC\u03BB\u03B1 \u03C4\u03B1 \u03B4\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03B1 \u03BC\u03B1\u03B8\u03B7\u03BC\u03AC\u03C4\u03C9\u03BD \u03B1\u03BD\u03AC \u03CE\u03C1\u03B1.
 statistic.title=\u03A3\u03C4\u03B1\u03C4\u03B9\u03C3\u03C4\u03B9\u03BA\u03AC \u03B1\u03BD\u03AC \u03CE\u03C1\u03B1
diff --git a/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_en.properties
index 37a9058d1acbd730a6b837e3bf42cdd1be693be6..9da44076a39234387bfbf85f24189ce35990cf55 100644
--- a/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_en.properties
@@ -6,8 +6,8 @@ menu.createstatfile=Per hour
 menu.createstatfile.alt=Show statistics per hour
 stat.table.header.node=Course element
 stat.table.header.total=Total
-statistic.chart.intro=This chart shows all accesses {0} based on the entire course data available (since {1}) per hour.
+statistic.chart.intro=This chart shows all accesses {0} based on the entire course data available per hour.
 statistic.chart.pernode.intro=This chart shows all accesses to course elements starting from {0} per hour.
-statistic.chart.pernode.total.intro=This chart shows all accesses to course elements based on the entire course data available (since {0}).<br/>Hours without clicks will not be displayed in the chart.
-statistic.intro=This statistic shows all accesses to course elements based on the entire course data available (since {0}) per hour.
+statistic.chart.pernode.total.intro=This chart shows all accesses to course elements based on the entire course data available.<br>Hours without clicks will not be displayed in the chart.
+statistic.intro=This statistic shows all accesses to course elements based on the entire course data available per hour.
 statistic.title=Statistics per hour
diff --git a/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_fr.properties
index 6e22ecf78cedec69bacf0d9831d8a604a83be953..77136e0856126bbd1ffec3e6ef75c46cf4b6a2cb 100644
--- a/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_fr.properties
@@ -6,8 +6,8 @@ menu.createstatfile=Par heure
 menu.createstatfile.alt=Afficher statistique par heure
 stat.table.header.node=El\u00E9ment de cours
 stat.table.header.total=Total
-statistic.chart.intro=Ce graphique montre tous les acc\u00E8s {0} bas\u00E9 sur toutes les donn\u00E9es de cours disponibles (depuis {1}) par heure.
+statistic.chart.intro=Ce graphique montre tous les acc\u00E8s {0} bas\u00E9 sur toutes les donn\u00E9es de cours disponibles par heure.
 statistic.chart.pernode.intro=Ce graphique montre tous les acc\u00E8s sur les \u00E9l\u00E9ments de cours par heure depuis {0}.
-statistic.chart.pernode.total.intro=Ce graphique montre tous les acc\u00E8s sur les \u00E9l\u00E9ments de cours bas\u00E9 sur toutes les donn\u00E9es de cours disponibles (depuis {0}).
-statistic.intro=Ces statistiques montrent tous les acc\u00E8s sur les \u00E9l\u00E9ments de cours bas\u00E9 sur toutes les donn\u00E9es de cours disponibles (depuis {0}) par heure.
+statistic.chart.pernode.total.intro=Ce graphique montre tous les acc\u00E8s sur les \u00E9l\u00E9ments de cours bas\u00E9 sur toutes les donn\u00E9es de cours disponibles.
+statistic.intro=Ces statistiques montrent tous les acc\u00E8s sur les \u00E9l\u00E9ments de cours bas\u00E9 sur toutes les donn\u00E9es de cours disponibles par heure.
 statistic.title=Statistiques par heure
diff --git a/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_it.properties
index e96ed5fcfc758db12175d898e539cc7306fd763c..3930d94ec7d497b0d516543a3497d59334fd7223 100644
--- a/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_it.properties
+++ b/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_it.properties
@@ -6,8 +6,8 @@ menu.createstatfile=per ora
 menu.createstatfile.alt=Mostrare statistica per ora
 stat.table.header.node=Elemento di corso
 stat.table.header.total=Totale
-statistic.chart.intro=Questa grafica mostra tutti i clic {0} sulla base di tutti i dati disponibili del corso (dal {1}) per ora.
+statistic.chart.intro=Questa grafica mostra tutti i clic {0} sulla base di tutti i dati disponibili del corso per ora.
 statistic.chart.pernode.intro=Questa grafica mostra tutti i clic sugli elementi di corso per ora da {0}.
-statistic.chart.pernode.total.intro=Questa grafica mostra tutti i clic sugli elementi di corso sulla base di tutti i dati disponibili del corso (dal {0}).
-statistic.intro=Questa grafica mostra tutti i clic sugli elementi di corso sulla base di tutti i dati disponibili del corso (dal {0}) per ora.
+statistic.chart.pernode.total.intro=Questa grafica mostra tutti i clic sugli elementi di corso sulla base di tutti i dati disponibili del corso.
+statistic.intro=Questa grafica mostra tutti i clic sugli elementi di corso sulla base di tutti i dati disponibili del corso per ora.
 statistic.title=Statistica per ora
diff --git a/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_jp.properties b/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_jp.properties
index f1a64ba29481fea905370ca85115247a73a5dbc6..e0f95380306ccec1b6d284e02e069b6f9b03c98b 100644
--- a/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_jp.properties
+++ b/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_jp.properties
@@ -6,8 +6,8 @@ menu.createstatfile=1\u6642\u9593\u3042\u305F\u308A
 menu.createstatfile.alt=1\u6642\u9593\u3042\u305F\u308A\u306E\u7D71\u8A08\u3092\u8868\u793A\u3059\u308B
 stat.table.header.node=\u30B3\u30FC\u30B9\u30A8\u30EC\u30E1\u30F3\u30C8
 stat.table.header.total=\u5408\u8A08
-statistic.chart.intro=\u3053\u306E\u30C1\u30E3\u30FC\u30C8\u3067\u306F ({1} \u4EE5\u6765) \u5229\u7528\u53EF\u80FD\u306A\u3059\u3079\u3066\u306E\u30B3\u30FC\u30B9\u30C7\u30FC\u30BF\u306B\u57FA\u3065\u304D\u3001 {0} \u3078\u306E\u30A2\u30AF\u30BB\u30B9\u3059\u3079\u3066\u3092\u6642\u9593\u3054\u3068\u306B\u8868\u793A\u3057\u307E\u3059\u3002
+statistic.chart.intro=\u3053\u306E\u30C1\u30E3\u30FC\u30C8\u3067\u306F \u5229\u7528\u53EF\u80FD\u306A\u3059\u3079\u3066\u306E\u30B3\u30FC\u30B9\u30C7\u30FC\u30BF\u306B\u57FA\u3065\u304D\u3001 {0} \u3078\u306E\u30A2\u30AF\u30BB\u30B9\u3059\u3079\u3066\u3092\u6642\u9593\u3054\u3068\u306B\u8868\u793A\u3057\u307E\u3059\u3002
 statistic.chart.pernode.intro=\u3053\u306E\u30C1\u30E3\u30FC\u30C8\u3067\u306F {0} \u4EE5\u964D\u306E\u30B3\u30FC\u30B9\u30A8\u30EC\u30E1\u30F3\u30C8\u30A2\u30AF\u30BB\u30B9\u3059\u3079\u3066\u3092\u6642\u9593\u3054\u3068\u306B\u8868\u793A\u3057\u307E\u3059\u3002
-statistic.chart.pernode.total.intro=\u3053\u306E\u30C1\u30E3\u30FC\u30C8\u3067\u306F ({0} \u4EE5\u6765) \u5229\u7528\u53EF\u80FD\u306A\u3059\u3079\u3066\u306E\u30B3\u30FC\u30B9\u30C7\u30FC\u30BF\u306B\u57FA\u3065\u304D\u3001 \u30B3\u30FC\u30B9\u30A8\u30EC\u30E1\u30F3\u30C8\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u3059\u3079\u3066\u3092\u6642\u9593\u3054\u3068\u306B\u8868\u793A\u3057\u307E\u3059\u3002
-statistic.intro=\u3053\u306E\u30C1\u30E3\u30FC\u30C8\u3067\u306F ({1} \u4EE5\u6765) \u5229\u7528\u53EF\u80FD\u306A\u3059\u3079\u3066\u306E\u30B3\u30FC\u30B9\u30C7\u30FC\u30BF\u306B\u57FA\u3065\u304D\u3001 \u30B3\u30FC\u30B9\u30A8\u30EC\u30E1\u30F3\u30C8\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u3059\u3079\u3066\u3092\u6642\u9593\u3054\u3068\u306B\u8868\u793A\u3057\u307E\u3059\u3002
+statistic.chart.pernode.total.intro=\u3053\u306E\u30C1\u30E3\u30FC\u30C8\u3067\u306F \u5229\u7528\u53EF\u80FD\u306A\u3059\u3079\u3066\u306E\u30B3\u30FC\u30B9\u30C7\u30FC\u30BF\u306B\u57FA\u3065\u304D\u3001 \u30B3\u30FC\u30B9\u30A8\u30EC\u30E1\u30F3\u30C8\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u3059\u3079\u3066\u3092\u6642\u9593\u3054\u3068\u306B\u8868\u793A\u3057\u307E\u3059\u3002
+statistic.intro=\u3053\u306E\u30C1\u30E3\u30FC\u30C8\u3067\u306F \u5229\u7528\u53EF\u80FD\u306A\u3059\u3079\u3066\u306E\u30B3\u30FC\u30B9\u30C7\u30FC\u30BF\u306B\u57FA\u3065\u304D\u3001 \u30B3\u30FC\u30B9\u30A8\u30EC\u30E1\u30F3\u30C8\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u3059\u3079\u3066\u3092\u6642\u9593\u3054\u3068\u306B\u8868\u793A\u3057\u307E\u3059\u3002
 statistic.title=\u6642\u9593\u3054\u3068\u306E\u7D71\u8A08
diff --git a/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_nl_NL.properties b/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_nl_NL.properties
index 08564b821de391d48615f3bf1641db2b8aa944c9..b4396292b0d332452696d6f8581eac6520405e51 100644
--- a/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_nl_NL.properties
+++ b/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_nl_NL.properties
@@ -6,8 +6,8 @@ menu.createstatfile=Per uur
 menu.createstatfile.alt=Toon statistieken per uur
 stat.table.header.node=Cursuselement
 stat.table.header.total=Totaal
-statistic.chart.intro=Deze grafiek toont alle toegangen {0} gebaseerd op volledige cursusdate beschikbaar (sinds {1}) per uur.
+statistic.chart.intro=Deze grafiek toont alle toegangen {0} gebaseerd op volledige cursusdate beschikbaar per uur.
 statistic.chart.pernode.intro=Deze grafiek toont alle toegangen tot cursuselementen gestart van {0} per uur.
-statistic.chart.pernode.total.intro=Deze grafiek toont alle toegangen tot cursuselementen gebaseerd op de volledige beschikbare cursusdata (since {0}).
-statistic.intro=Deze statistiek toont alle toegangen tot cursuselementen gebaseerd op de volledige cursusdata beschikbaar (since {0}) per uur.
+statistic.chart.pernode.total.intro=Deze grafiek toont alle toegangen tot cursuselementen gebaseerd op de volledige beschikbare cursusdata.
+statistic.intro=Deze statistiek toont alle toegangen tot cursuselementen gebaseerd op de volledige cursusdata beschikbaar per uur.
 statistic.title=Statistieken per uur
diff --git a/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_pl.properties b/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_pl.properties
index 9b9318c0dbf62f01c6cba21703e2c24e7b7784dd..dcc29775fd0e0f1edb9f6c69fdb487a31c5d1d25 100644
--- a/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_pl.properties
+++ b/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_pl.properties
@@ -4,8 +4,8 @@ menu.createstatfile=Na godzin\u0119
 menu.createstatfile.alt=Poka\u017C statystyki godzinowe
 stat.table.header.node=Element kursu
 stat.table.header.total=Og\u00F3\u0142em
-statistic.chart.intro=Ten wykres przedstawia wszystkie zapytania {0}, bazuj\u0105c na wszystkich dost\u0119pnych danych kursu (od {1}), na godzin\u0119.
+statistic.chart.intro=Ten wykres przedstawia wszystkie zapytania {0}, bazuj\u0105c na wszystkich dost\u0119pnych danych kursu, na godzin\u0119.
 statistic.chart.pernode.intro=Ten wykres przedstawia wszystkie zapytania do element\u00F3w kursu na godzin\u0119, poczynaj\u0105c od {0}.
-statistic.chart.pernode.total.intro=Ten wykres przedstawia wszystkie zapytania do element\u00F3w kursu, bazuj\u0105c na wszystkich dost\u0119pnych kursu (od {0}).
-statistic.intro=Te statystyki przedstawiaj\u0105 wszystkie zapytania do element\u00F3w kursu, bazuj\u0105c na wszystkich dost\u0119pnych danych kursu (od {0}), na godzin\u0119.
+statistic.chart.pernode.total.intro=Ten wykres przedstawia wszystkie zapytania do element\u00F3w kursu, bazuj\u0105c na wszystkich dost\u0119pnych kursu.
+statistic.intro=Te statystyki przedstawiaj\u0105 wszystkie zapytania do element\u00F3w kursu, bazuj\u0105c na wszystkich dost\u0119pnych danych kursu, na godzin\u0119.
 statistic.title=Statystyki godzinowe
diff --git a/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_pt_BR.properties
index 1cf812d1b2749adeb1d70a1620eeaf2ce708e266..d7d872f39fe9a805757fc47ae80607090f49eadf 100644
--- a/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_pt_BR.properties
@@ -6,8 +6,8 @@ menu.createstatfile=Por hora
 menu.createstatfile.alt=Ver as estat\u00EDsticas por hora
 stat.table.header.node=Elemento do Curso
 stat.table.header.total=Total
-statistic.chart.intro=Este gr\u00E1fico mostra todos os acessos {0} baseados em todos os dados do curso dispon\u00EDveis (desde {1}) por hora.
+statistic.chart.intro=Este gr\u00E1fico mostra todos os acessos {0} baseados em todos os dados do curso dispon\u00EDveis por hora.
 statistic.chart.pernode.intro=Este gr\u00E1fico mostra todos os acessos a elementos do curso a partir de {0} por hora.
-statistic.chart.pernode.total.intro=Este gr\u00E1fico mostra todos os acessos a elementos do curso com base em todos os dados dispon\u00EDveis (desde {0}).
-statistic.intro=Esta estat\u00EDstica mostra todos os acessos a elementos do curso com base em todos os dados dispon\u00EDveis (desde {0}) por hora.
+statistic.chart.pernode.total.intro=Este gr\u00E1fico mostra todos os acessos a elementos do curso com base em todos os dados dispon\u00EDveis.
+statistic.intro=Esta estat\u00EDstica mostra todos os acessos a elementos do curso com base em todos os dados dispon\u00EDveis por hora.
 statistic.title=Estat\u00EDsticas por hora
diff --git a/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_zh_CN.properties
index f29081212d953a53042d7cf26e441e0275b7a03b..a95cfc29d9a0d00dd8e95d6471d5e30a373025aa 100644
--- a/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/course/statistic/hourofday/_i18n/LocalStrings_zh_CN.properties
@@ -6,8 +6,7 @@ menu.createstatfile=\u6BCF\u5C0F\u65F6
 menu.createstatfile.alt=\u663E\u793A\u6BCF\u5C0F\u65F6\u7684\u7EDF\u8BA1\u91CF
 stat.table.header.node=\u5B66\u7A0B\u5143\u7D20
 stat.table.header.total=\u603B\u8BA1
-statistic.chart.intro=\u6B64\u56FE\u8868\u663E\u793A\u4E86\u4ECE{1}\u8D77\u7684\u57FA\u4E8E\u6240\u6709\u6709\u6548\u5B66\u7A0B\u6570\u636E{0}\u7684\u8BBF\u95EE\uFF08\u6BCF\u5C0F\u65F6\uFF09\u3002
+statistic.chart.intro=\u6B64\u56FE\u8868\u663E\u793A\u4E86\u4ECE{1}\u8D77\u7684\u57FA\u4E8E\u6240\u6709\u6709\u6548\u5B66\u7A0B\u6570\u636E\u7684\u8BBF\u95EE\uFF08\u6BCF\u5C0F\u65F6\uFF09\u3002
 statistic.chart.pernode.intro=\u6B64\u56FE\u8868\u663E\u793A\u4E86\u4ECE{0}\u8D77\u7684\u6240\u6709\u8BBF\u95EE\u5B66\u7A0B\u5143\u7D20\u7684\u8BBF\u95EE\u91CF\uFF08\u6BCF\u5C0F\u65F6\uFF09\u3002
-statistic.chart.pernode.total.intro=\u6B64\u56FE\u8868\u663E\u793A\u4E86\u4ECE{0}\u8D77\u7684\u57FA\u4E8E\u6240\u6709\u6709\u6548\u5B66\u7A0B\u6570\u636E\u7684\u8BBF\u95EE\uFF08\u6BCF\u5C0F\u65F6\uFF09\u3002
-statistic.intro=\u6B64\u7EDF\u8BA1\u663E\u793A\u4E86\u4ECE{0}\u8D77\u7684\u57FA\u4E8E\u6240\u6709\u6709\u6548\u5B66\u7A0B\u6570\u636E{0}\u7684\u8BBF\u95EE\uFF08\u6BCF\u5C0F\u65F6\uFF09\u3002
+statistic.chart.pernode.total.intro=\u6B64\u56FE\u8868\u663E\u793A\u4E86\u4ECE\u8D77\u7684\u57FA\u4E8E\u6240\u6709\u6709\u6548\u5B66\u7A0B\u6570\u636E\u7684\u8BBF\u95EE\uFF08\u6BCF\u5C0F\u65F6\uFF09\u3002
 statistic.title=\u6BCF\u5C0F\u65F6\u7684\u7EDF\u8BA1
diff --git a/src/main/java/org/olat/course/statistic/weekly/WeeklyStatisticDisplayController.java b/src/main/java/org/olat/course/statistic/weekly/WeeklyStatisticDisplayController.java
index 49d3fa131e99af6392bc15fcfcd33a074b217e9f..60431cf6c10c9f0d933adf79149abcbe6395a7d5 100644
--- a/src/main/java/org/olat/course/statistic/weekly/WeeklyStatisticDisplayController.java
+++ b/src/main/java/org/olat/course/statistic/weekly/WeeklyStatisticDisplayController.java
@@ -39,9 +39,7 @@ import org.olat.course.statistic.StatisticResult;
 
 public class WeeklyStatisticDisplayController extends StatisticDisplayController {
 
-	private VelocityContainer weeklyStatisticFormVc_;
-	private VelocityContainer weeklyStatisticVc_;
-	private DateChooserForm form_;
+	private DateChooserForm dateChooser;
 
 	public WeeklyStatisticDisplayController(UserRequest ureq, WindowControl windowControl, ICourse course, IStatisticManager statisticManager) {
 		super(ureq, windowControl, course, statisticManager);
@@ -51,24 +49,24 @@ public class WeeklyStatisticDisplayController extends StatisticDisplayController
 	protected Component createInitialComponent(UserRequest ureq) {
 		setVelocityRoot(Util.getPackageVelocityRoot(getClass()));
 
-		weeklyStatisticVc_ = createVelocityContainer("weeklystatisticparent");
+		VelocityContainer weeklyStatisticVc = createVelocityContainer("weeklystatisticparent");
 		
-		weeklyStatisticFormVc_ = createVelocityContainer("weeklystatisticform");
-		form_ = new DateChooserForm(ureq, getWindowControl(), 8*7);
-		listenTo(form_);
-		weeklyStatisticFormVc_.put("statisticForm", form_.getInitialComponent());
-		weeklyStatisticFormVc_.contextPut("statsSince", getStatsSinceStr());
+		VelocityContainer weeklyStatisticFormVc = createVelocityContainer("weeklystatisticform");
+		dateChooser = new DateChooserForm(ureq, getWindowControl(), 8*7);
+		listenTo(dateChooser);
+		weeklyStatisticFormVc.put("statisticForm", dateChooser.getInitialComponent());
 
-		weeklyStatisticVc_.put("weeklystatisticform", weeklyStatisticFormVc_);
+		weeklyStatisticVc.put("weeklystatisticform", weeklyStatisticFormVc);
 
 		Component parentInitialComponent = super.createInitialComponent(ureq);
-		weeklyStatisticVc_.put("statistic", parentInitialComponent);
+		weeklyStatisticVc.put("statistic", parentInitialComponent);
 		
-		return weeklyStatisticVc_;
+		return weeklyStatisticVc;
 	}
 
+	@Override
 	public void event(UserRequest ureq, Controller source, Event event) {
-		if (source == form_ && event == Event.DONE_EVENT) {
+		if (source == dateChooser && event == Event.DONE_EVENT) {
 			// need to regenerate the statisticResult
 			// and now recreate the table controller
 			recreateTableController(ureq);
@@ -80,9 +78,6 @@ public class WeeklyStatisticDisplayController extends StatisticDisplayController
 	protected StatisticResult recalculateStatisticResult(UserRequest ureq) {
 		// recalculate the statistic result based on the from and to dates.
 		// do this by going via sql (see WeeklyStatisticManager)
-		IStatisticManager weeklyStatisticManager = getStatisticManager();			
-		StatisticResult statisticResult = 
-			weeklyStatisticManager.generateStatisticResult(ureq, getCourse(), getCourseRepositoryEntryKey(), form_.getFromDate(), form_.getToDate());
-		return statisticResult;
+		return getStatisticManager().generateStatisticResult(ureq, getCourse(), getCourseRepositoryEntryKey(), dateChooser.getFromDate(), dateChooser.getToDate());
 	}
 }
diff --git a/src/main/java/org/olat/course/statistic/weekly/WeeklyStatisticManager.java b/src/main/java/org/olat/course/statistic/weekly/WeeklyStatisticManager.java
index a5a5077ff3c78af9988d143240b3a7f8109b0ca0..edf07657cc3632a6824c2cdee446a547c55e33cb 100644
--- a/src/main/java/org/olat/course/statistic/weekly/WeeklyStatisticManager.java
+++ b/src/main/java/org/olat/course/statistic/weekly/WeeklyStatisticManager.java
@@ -59,7 +59,7 @@ public class WeeklyStatisticManager implements IStatisticManager {
 
 	/** the logging object used in this class **/
 	private static final OLog log = Tracing.createLoggerFor(WeeklyStatisticManager.class);
-	private SimpleDateFormat sdf_ = new SimpleDateFormat("yyyy-ww");
+	private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-ww");
 	
 	@Override
 	public StatisticResult generateStatisticResult(UserRequest ureq, ICourse course, long courseRepositoryEntryKey) {
@@ -104,7 +104,7 @@ public class WeeklyStatisticManager implements IStatisticManager {
 		TypedQuery<Object[]> dbQuery = DBFactory.getInstance().getCurrentEntityManager()
 				.createQuery(sb.toString(), Object[].class)
 				.setParameter("resId", courseRepositoryEntryKey);
-		StringBuffer infoMsg = new StringBuffer();
+		StringBuilder infoMsg = new StringBuilder(256);
 		if (fromDate!=null) {
 			String fromDateStr = getYear(fromDate) + "-" + getWeek(fromDate);
 			infoMsg.append("from date: "+fromDateStr);
@@ -127,15 +127,15 @@ public class WeeklyStatisticManager implements IStatisticManager {
 	}
 
 	private String getWeek(Date date) {
-		SimpleDateFormat sdf = new SimpleDateFormat(); 
-		sdf.applyPattern("ww");
-		return sdf.format(date);
+		SimpleDateFormat df = new SimpleDateFormat(); 
+		df.applyPattern("ww");
+		return df.format(date);
 	}
 
 	private String getYear(Date date) {
-		SimpleDateFormat sdf = new SimpleDateFormat(); 
-		sdf.applyPattern("yyyy");
-		return sdf.format(date);
+		SimpleDateFormat df = new SimpleDateFormat(); 
+		df.applyPattern("yyyy");
+		return df.format(date);
 	}
 
 	/** fill any gaps in the column headers between the first and the last days **/
@@ -166,9 +166,9 @@ public class WeeklyStatisticManager implements IStatisticManager {
 			log.debug("fillGapsInColumnHeaders: columnHeaders.size()="+columnHeaders.size());
 			log.debug("fillGapsInColumnHeaders: columnHeaders="+columnHeaders);
 			if (columnHeaders.size()>1) {
-				Date previousWeekDate = sdf_.parse(previousWeek);
+				Date previousWeekDate = sdf.parse(previousWeek);
 				String lastWeek = columnHeaders.get(columnHeaders.size()-1);
-				Date lastWeekDate = sdf_.parse(lastWeek);
+				Date lastWeekDate = sdf.parse(lastWeek);
 				if (previousWeekDate==null || lastWeekDate==null) {
 					log.warn("fillGapsInColumnHeaders: can't get date from weeks: "+previousWeek+"/"+lastWeek);
 					return null;
@@ -197,7 +197,7 @@ public class WeeklyStatisticManager implements IStatisticManager {
 						log.warn("fillGapsInColumnHeaders: throwing a ParseException, can't add "+additionalWeek+" to "+columnHeaders);
 						throw new ParseException("Can't add "+additionalWeek+" to the list of weeks - it is already there", 0);
 					}
-					if (sdf_.parse(additionalWeek).compareTo(sdf_.parse(currWeek))>0) {
+					if (sdf.parse(additionalWeek).compareTo(sdf.parse(currWeek))>0) {
 						// then we're overshooting
 						continue;
 					}
@@ -219,9 +219,9 @@ public class WeeklyStatisticManager implements IStatisticManager {
 	}
 
 	private String nextWeek(String week) throws ParseException {
-		Date d = sdf_.parse(week);
+		Date d = sdf.parse(week);
 		d = new Date(d.getTime() + 7*24*60*60*1000);
-		String result = sdf_.format(d);
+		String result = sdf.format(d);
 		
 		// bug with SimpleDateFormat:
 		//   Mon Dec 29 00:00:00 CET 2008
@@ -255,7 +255,7 @@ public class WeeklyStatisticManager implements IStatisticManager {
 		} else if (result.equals(week)) {
 			// daylight saving
 			d = new Date(d.getTime() + 1*60*60*1000);
-			result = sdf_.format(d);
+			result = sdf.format(d);
 		}
 		
 		return result;
diff --git a/src/main/java/org/olat/course/statistic/weekly/_content/weeklystatisticform.html b/src/main/java/org/olat/course/statistic/weekly/_content/weeklystatisticform.html
index 03cfb800fe7f1b7b6bae5884046399b624440fa6..60f332e06482cfbeb4943ac2a48dd0346cbc9a4c 100644
--- a/src/main/java/org/olat/course/statistic/weekly/_content/weeklystatisticform.html
+++ b/src/main/java/org/olat/course/statistic/weekly/_content/weeklystatisticform.html
@@ -1,6 +1,6 @@
 <fieldset class="o_form form-horizontal">
 	<legend>
 		$r.translate("statistic.title")</legend>
-	<div class="o_desc">$r.translate("statistic.intro", $statsSince)</div>
+	<div class="o_desc">$r.translate("statistic.intro")</div>
 	$r.render("statisticForm")
 </fieldset>
diff --git a/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_ar.properties b/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_ar.properties
index 22afb1e9be54db7579a67bcc4bea903851264ad1..646edcb4f12d9545bdf563ea11c1495d5f1d396d 100644
--- a/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_ar.properties
+++ b/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_ar.properties
@@ -8,8 +8,8 @@ menu.createstatfile=\u0623\u0633\u0628\u0648\u0639\u064A\u0627\u064B
 menu.createstatfile.alt=\u0639\u0631\u0636 \u0627\u0644\u0625\u062D\u0635\u0627\u0626\u064A\u0627\u062A \u0627\u0644\u0623\u0633\u0628\u0648\u0639\u064A\u0629
 stat.table.header.node=\u0639\u0646\u0635\u0631 \u0627\u0644\u0645\u0642\u0631\u0631
 stat.table.header.total=\u0627\u0644\u0645\u062C\u0645\u0648\u0639
-statistic.chart.intro=\u064A\u0639\u0631\u0636 \u0647\u0630\u0627 \u0627\u0644\u0645\u062E\u0637\u0637 \u0643\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A {0} \u0628\u0646\u0627\u0621\u0627\u064B \u0639\u0644\u0649 \u0643\u0644 \u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0645\u0642\u0631\u0631 \u0627\u0644\u0645\u062A\u0627\u062D\u0629 (\u0645\u0646\u0630 {1}) \u0645\u0631\u062A\u0628\u0629 \u0644\u0643\u0644 \u0623\u0633\u0628\u0648\u0639.
+statistic.chart.intro=\u064A\u0639\u0631\u0636 \u0647\u0630\u0627 \u0627\u0644\u0645\u062E\u0637\u0637 \u0643\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A {0} \u0628\u0646\u0627\u0621\u0627\u064B \u0639\u0644\u0649 \u0643\u0644 \u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0645\u0642\u0631\u0631 \u0627\u0644\u0645\u062A\u0627\u062D\u0629 \u0645\u0631\u062A\u0628\u0629 \u0644\u0643\u0644 \u0623\u0633\u0628\u0648\u0639.
 statistic.chart.pernode.intro=.{0} \u064A\u0639\u0631\u0636 \u0647\u0630\u0627 \u0627\u0644\u0645\u062E\u0637\u0637 \u0643\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0644\u0639\u0646\u0627\u0635\u0631 \u0627\u0644\u0645\u0642\u0631\u0631 \u0641\u0649 \u0627\u0644\u0623\u0633\u0628\u0648\u0639
-statistic.chart.pernode.total.intro=\u064A\u0639\u0631\u0636 \u0647\u0630\u0627 \u0627\u0644\u0645\u062E\u0637\u0637 \u0643\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0644\u0639\u0646\u0627\u0635\u0631 \u0627\u0644\u0645\u0642\u0631\u0631 \u0628\u0646\u0627\u0621\u0627\u064B \u0639\u0644\u0649 \u0643\u0644 \u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0645\u0642\u0631\u0631 \u0627\u0644\u0645\u062A\u0627\u062D\u0629 (\u0645\u0646\u0630 {0}).
-statistic.intro=\u064A\u0639\u0631\u0636 \u0647\u0630\u0627 \u0627\u0644\u0645\u062E\u0637\u0637 \u0643\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0644\u0639\u0646\u0627\u0635\u0631 \u0627\u0644\u0645\u0642\u0631\u0631 \u0628\u0646\u0627\u0621\u0627\u064B \u0639\u0644\u0649 \u0643\u0644 \u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0645\u0642\u0631\u0631 \u0627\u0644\u0645\u062A\u0627\u062D\u0629 (\u0645\u0646\u0630 {0}) \u0644\u0643\u0644 \u0623\u0633\u0628\u0648\u0639.
+statistic.chart.pernode.total.intro=\u064A\u0639\u0631\u0636 \u0647\u0630\u0627 \u0627\u0644\u0645\u062E\u0637\u0637 \u0643\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0644\u0639\u0646\u0627\u0635\u0631 \u0627\u0644\u0645\u0642\u0631\u0631 \u0628\u0646\u0627\u0621\u0627\u064B \u0639\u0644\u0649 \u0643\u0644 \u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0645\u0642\u0631\u0631 \u0627\u0644\u0645\u062A\u0627\u062D\u0629.
+statistic.intro=\u064A\u0639\u0631\u0636 \u0647\u0630\u0627 \u0627\u0644\u0645\u062E\u0637\u0637 \u0643\u0644 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0644\u0639\u0646\u0627\u0635\u0631 \u0627\u0644\u0645\u0642\u0631\u0631 \u0628\u0646\u0627\u0621\u0627\u064B \u0639\u0644\u0649 \u0643\u0644 \u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0645\u0642\u0631\u0631 \u0627\u0644\u0645\u062A\u0627\u062D\u0629 \u0644\u0643\u0644 \u0623\u0633\u0628\u0648\u0639.
 statistic.title=\u0627\u0644\u0625\u062D\u0635\u0627\u0626\u064A\u0627\u062A \u0627\u0644\u0623\u0633\u0628\u0648\u0639\u064A\u0629
diff --git a/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_de.properties
index 6748adad4e35defdafe68dea75417795126428ed..59c378b39fd31b4ecb6b68c56469e3c147783898 100644
--- a/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_de.properties
@@ -2,8 +2,8 @@ menu.createstatfile=W\u00F6chentlich
 menu.createstatfile.alt=W\u00F6chentliche Statistik anzeigen
 
 statistic.title=W\u00F6chentliche Statistik
-statistic.intro=Diese Statistik zeigt alle Zugriffe auf die Kursbausteine basierend auf allen verf\u00FCgbaren Kursdaten (seit {0}) pro Woche. <br/>Der Spaltentitel setzt sich jeweils aus der Jahreszahl und der Kalenderwoche zusammen. Der Eintrag "2011-7" steht z.B. f\u00fcr die siebte Kalenderwoche des Jahres 2011.
-statistic.chart.intro=Diese Grafik zeigt alle Zugriffe {0} basierend auf allen verf\u00FCgbaren Kursdaten (seit {1}) gruppiert nach Woche.
+statistic.intro=Diese Statistik zeigt alle Zugriffe auf die Kursbausteine basierend auf allen verf\u00FCgbaren Kursdaten pro Woche. <br/>Der Spaltentitel setzt sich jeweils aus der Jahreszahl und der Kalenderwoche zusammen. Der Eintrag "2011-7" steht z.B. f\u00fcr die siebte Kalenderwoche des Jahres 2011.
+statistic.chart.intro=Diese Grafik zeigt alle Zugriffe {0} basierend auf allen verf\u00FCgbaren Kursdaten gruppiert nach Woche.
 statistic.chart.pernode.intro=Diese Grafik zeigt alle Zugriffe auf die Kursbausteine in der Woche {0}.
 statistic.chart.pernode.total.intro=Diese Grafik zeigt alle Zugriffe auf die Kursbausteine w\u00e4hrend der gew\u00e4hlten Zeitspanne.
 
diff --git a/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_el.properties b/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_el.properties
index 57401658a6f43068979c02c518396f1f79bc31b4..3f025bff526d82b10c60c885883862901f4f34e7 100644
--- a/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_el.properties
+++ b/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_el.properties
@@ -8,8 +8,8 @@ menu.createstatfile=\u0395\u03B2\u03B4\u03BF\u03BC\u03B1\u03B4\u03B9\u03B1\u03AF
 menu.createstatfile.alt=\u03A0\u03C1\u03BF\u03B2\u03BF\u03BB\u03AE \u03B5\u03B2\u03B4\u03BF\u03BC\u03B1\u03B4\u03B9\u03B1\u03AF\u03C9\u03BD \u03C3\u03C4\u03B1\u03C4\u03B9\u03C3\u03C4\u03B9\u03BA\u03CE\u03BD
 stat.table.header.node=\u03A3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03BF \u03BC\u03B1\u03B8\u03AE\u03BC\u03B1\u03C4\u03BF\u03C2
 stat.table.header.total=\u03A3\u03CD\u03BD\u03BF\u03BB\u03BF
-statistic.chart.intro=\u0391\u03C5\u03C4\u03CC \u03C4\u03BF \u03B4\u03B9\u03AC\u03B3\u03C1\u03B1\u03BC\u03BC\u03B1 \u03B4\u03B5\u03AF\u03C7\u03BD\u03B5\u03B9 \u03CC\u03BB\u03B5\u03C2 \u03C4\u03B9\u03C2 \u03C0\u03C1\u03BF\u03C3\u03B2\u03AC\u03C3\u03B5\u03B9\u03C2 {0} \u03BF\u03B9 \u03BF\u03C0\u03BF\u03AF\u03B5\u03C2 \u03B2\u03B1\u03C3\u03AF\u03B6\u03BF\u03BD\u03C4\u03B1\u03B9 \u03C3\u03C4\u03B1 \u03B4\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03B1 \u03CC\u03BB\u03C9\u03BD \u03C4\u03C9\u03BD \u03BC\u03B1\u03B8\u03B7\u03BC\u03AC\u03C4\u03C9\u03BD \u03C0\u03BF\u03C5 \u03B5\u03AF\u03BD\u03B1\u03B9 \u03B4\u03B9\u03B1\u03B8\u03AD\u03C3\u03B9\u03BC\u03B1 (\u03B1\u03C0\u03CC \u03C4\u03B9\u03C2 {1}) \u03C4\u03B1\u03BE\u03B9\u03BD\u03BF\u03BC\u03B7\u03BC\u03AD\u03BD\u03B1 \u03B1\u03BD\u03AC \u03B5\u03B2\u03B4\u03BF\u03BC\u03AC\u03B4\u03B1.
+statistic.chart.intro=\u0391\u03C5\u03C4\u03CC \u03C4\u03BF \u03B4\u03B9\u03AC\u03B3\u03C1\u03B1\u03BC\u03BC\u03B1 \u03B4\u03B5\u03AF\u03C7\u03BD\u03B5\u03B9 \u03CC\u03BB\u03B5\u03C2 \u03C4\u03B9\u03C2 \u03C0\u03C1\u03BF\u03C3\u03B2\u03AC\u03C3\u03B5\u03B9\u03C2 {0} \u03BF\u03B9 \u03BF\u03C0\u03BF\u03AF\u03B5\u03C2 \u03B2\u03B1\u03C3\u03AF\u03B6\u03BF\u03BD\u03C4\u03B1\u03B9 \u03C3\u03C4\u03B1 \u03B4\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03B1 \u03CC\u03BB\u03C9\u03BD \u03C4\u03C9\u03BD \u03BC\u03B1\u03B8\u03B7\u03BC\u03AC\u03C4\u03C9\u03BD \u03C0\u03BF\u03C5 \u03B5\u03AF\u03BD\u03B1\u03B9 \u03B4\u03B9\u03B1\u03B8\u03AD\u03C3\u03B9\u03BC\u03B1 \u03C4\u03B1\u03BE\u03B9\u03BD\u03BF\u03BC\u03B7\u03BC\u03AD\u03BD\u03B1 \u03B1\u03BD\u03AC \u03B5\u03B2\u03B4\u03BF\u03BC\u03AC\u03B4\u03B1.
 statistic.chart.pernode.intro=\u0391\u03C5\u03C4\u03CC \u03C4\u03BF \u03B4\u03B9\u03AC\u03B3\u03C1\u03B1\u03BC\u03BC\u03B1 \u03B4\u03B5\u03AF\u03C7\u03BD\u03B5\u03B9 \u03CC\u03BB\u03B5\u03C2 \u03C4\u03B9\u03C2 \u03C0\u03C1\u03BF\u03C3\u03B2\u03AC\u03C3\u03B5\u03B9\u03C2 \u03C3\u03C4\u03B1 \u03C3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03B1 \u03BC\u03B1\u03B8\u03AE\u03BC\u03B1\u03C4\u03BF\u03C2 \u03BA\u03B1\u03C4\u03AC \u03C4\u03B7\u03BD \u03B5\u03B2\u03B4\u03BF\u03BC\u03AC\u03B4\u03B1 {0}.
-statistic.chart.pernode.total.intro=\u0391\u03C5\u03C4\u03CC \u03C4\u03BF \u03B4\u03B9\u03AC\u03B3\u03C1\u03B1\u03BC\u03BC\u03B1 \u03B4\u03B5\u03AF\u03C7\u03BD\u03B5\u03B9 \u03CC\u03BB\u03B5\u03C2 \u03C4\u03B9\u03C2 \u03C0\u03C1\u03BF\u03C3\u03B2\u03AC\u03C3\u03B5\u03B9\u03C2 \u03C3\u03C4\u03B1 \u03C3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03B1 \u03BC\u03B1\u03B8\u03AE\u03BC\u03B1\u03C4\u03BF\u03C2 \u03C0\u03BF\u03C5 \u03B2\u03B1\u03C3\u03AF\u03B6\u03BF\u03BD\u03C4\u03B1\u03B9 \u03C3\u03C4\u03B1 \u03B4\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03B1 \u03CC\u03BB\u03C9\u03BD \u03C4\u03C9\u03BD \u03BC\u03B1\u03B8\u03B7\u03BC\u03AC\u03C4\u03C9\u03BD \u03C0\u03BF\u03C5 \u03B5\u03AF\u03BD\u03B1\u03B9 \u03B4\u03B9\u03B1\u03B8\u03AD\u03C3\u03B9\u03BC\u03B1 (\u03B1\u03C0\u03CC \u03C4\u03B9\u03C2 {0}).
-statistic.intro=\u0391\u03C5\u03C4\u03AE \u03B7 \u03C3\u03C4\u03B1\u03C4\u03B9\u03C3\u03C4\u03B9\u03BA\u03AE \u03B4\u03B5\u03AF\u03C7\u03BD\u03B5\u03B9 \u03CC\u03BB\u03B5\u03C2 \u03C4\u03B9\u03C2 \u03C0\u03C1\u03BF\u03C3\u03B2\u03AC\u03C3\u03B5\u03B9 \u03C3\u03C4\u03B1 \u03C3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03B1 \u03BC\u03B1\u03B8\u03AE\u03BC\u03B1\u03C4\u03BF\u03C2 \u03C0\u03BF\u03C5 \u03B2\u03B1\u03C3\u03AF\u03B6\u03BF\u03BD\u03C4\u03B1\u03B9 \u03C3\u03C4\u03B1 \u03B4\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03B1 \u03BC\u03B1\u03B8\u03AE\u03BC\u03B1\u03C4\u03BF\u03C2 \u03C0\u03BF\u03C5 \u03B5\u03AF\u03BD\u03B1\u03B9 \u03B4\u03B9\u03B1\u03B8\u03AD\u03C3\u03B9\u03BC\u03B1 (\u03B1\u03C0\u03CC \u03C4\u03B9\u03C2 {0}) \u03B1\u03BD\u03AC \u03B5\u03B2\u03B4\u03BF\u03BC\u03AC\u03B4\u03B1.
+statistic.chart.pernode.total.intro=\u0391\u03C5\u03C4\u03CC \u03C4\u03BF \u03B4\u03B9\u03AC\u03B3\u03C1\u03B1\u03BC\u03BC\u03B1 \u03B4\u03B5\u03AF\u03C7\u03BD\u03B5\u03B9 \u03CC\u03BB\u03B5\u03C2 \u03C4\u03B9\u03C2 \u03C0\u03C1\u03BF\u03C3\u03B2\u03AC\u03C3\u03B5\u03B9\u03C2 \u03C3\u03C4\u03B1 \u03C3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03B1 \u03BC\u03B1\u03B8\u03AE\u03BC\u03B1\u03C4\u03BF\u03C2 \u03C0\u03BF\u03C5 \u03B2\u03B1\u03C3\u03AF\u03B6\u03BF\u03BD\u03C4\u03B1\u03B9 \u03C3\u03C4\u03B1 \u03B4\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03B1 \u03CC\u03BB\u03C9\u03BD \u03C4\u03C9\u03BD \u03BC\u03B1\u03B8\u03B7\u03BC\u03AC\u03C4\u03C9\u03BD \u03C0\u03BF\u03C5 \u03B5\u03AF\u03BD\u03B1\u03B9 \u03B4\u03B9\u03B1\u03B8\u03AD\u03C3\u03B9\u03BC\u03B1.
+statistic.intro=\u0391\u03C5\u03C4\u03AE \u03B7 \u03C3\u03C4\u03B1\u03C4\u03B9\u03C3\u03C4\u03B9\u03BA\u03AE \u03B4\u03B5\u03AF\u03C7\u03BD\u03B5\u03B9 \u03CC\u03BB\u03B5\u03C2 \u03C4\u03B9\u03C2 \u03C0\u03C1\u03BF\u03C3\u03B2\u03AC\u03C3\u03B5\u03B9 \u03C3\u03C4\u03B1 \u03C3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03B1 \u03BC\u03B1\u03B8\u03AE\u03BC\u03B1\u03C4\u03BF\u03C2 \u03C0\u03BF\u03C5 \u03B2\u03B1\u03C3\u03AF\u03B6\u03BF\u03BD\u03C4\u03B1\u03B9 \u03C3\u03C4\u03B1 \u03B4\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03B1 \u03BC\u03B1\u03B8\u03AE\u03BC\u03B1\u03C4\u03BF\u03C2 \u03C0\u03BF\u03C5 \u03B5\u03AF\u03BD\u03B1\u03B9 \u03B4\u03B9\u03B1\u03B8\u03AD\u03C3\u03B9\u03BC\u03B1 \u03B1\u03BD\u03AC \u03B5\u03B2\u03B4\u03BF\u03BC\u03AC\u03B4\u03B1.
 statistic.title=\u0395\u03B2\u03B4\u03BF\u03BC\u03B1\u03B4\u03B9\u03B1\u03AF\u03B1 \u03A3\u03C4\u03B1\u03C4\u03B9\u03C3\u03C4\u03B9\u03BA\u03AC
diff --git a/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_en.properties
index b6be3db09802771fe81c14b8de2f309a4d1b7836..3a285c4806e5802eaf685ce85d798c82998979ea 100644
--- a/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_en.properties
@@ -8,8 +8,8 @@ menu.createstatfile=Weekly
 menu.createstatfile.alt=Show weekly statistics
 stat.table.header.node=Course element
 stat.table.header.total=Total
-statistic.chart.intro=This chart shows all accesses {0} based on the entire course data available (since {1}) sorted by week.
+statistic.chart.intro=This chart shows all accesses {0} based on the entire course data available sorted by week.
 statistic.chart.pernode.intro=This chart shows all accesses to course elements in week {0}.
-statistic.chart.pernode.total.intro=This chart shows all accesses to course elements based on the entire course data available (since {0}).
-statistic.intro=This statistic shows all accesses to course elements based on the entire course data available (since {0}) per week. <br/>The column title consists of year and calendar week. The entry "2011-7" for example means calendar week 7 in the year 2011.
+statistic.chart.pernode.total.intro=This chart shows all accesses to course elements based on the entire course data available.
+statistic.intro=This statistic shows all accesses to course elements based on the entire course data available per week. <br/>The column title consists of year and calendar week. The entry "2011-7" for example means calendar week 7 in the year 2011.
 statistic.title=Weekly statistics
diff --git a/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_fr.properties
index de2963e8cf459c31f1835eb68ad52195d7fa080a..22de2ee2007440eb96b0d7c6020d544a297ad44b 100644
--- a/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_fr.properties
@@ -8,8 +8,8 @@ menu.createstatfile=Hebdomadaire
 menu.createstatfile.alt=Afficher statistiques hebdomadaires
 stat.table.header.node=El\u00E9ment de cours
 stat.table.header.total=Total
-statistic.chart.intro=Ce graphique montre tous les acc\u00E8s {0} bas\u00E9 sur toutes les donn\u00E9es de cours disponibles (depuis {1}) group\u00E9 par semaine.
+statistic.chart.intro=Ce graphique montre tous les acc\u00E8s {0} bas\u00E9 sur toutes les donn\u00E9es de cours disponibles group\u00E9 par semaine.
 statistic.chart.pernode.intro=Ce graphique montre tous les acc\u00E8s sur les \u00E9l\u00E9ments de cours dans la semaine {0}.
-statistic.chart.pernode.total.intro=Ce graphique montre tous les acc\u00E8s sur les \u00E9l\u00E9ments de cours bas\u00E9 sur toutes les donn\u00E9es de cours (depuis {0}).
-statistic.intro=Ces statistiques montre tous les acc\u00E8s sur les \u00E9l\u00E9ments de cours bas\u00E9 sur toutes les donn\u00E9es de cours (depuis {0}) par semaine.
+statistic.chart.pernode.total.intro=Ce graphique montre tous les acc\u00E8s sur les \u00E9l\u00E9ments de cours bas\u00E9 sur toutes les donn\u00E9es de cours.
+statistic.intro=Ces statistiques montre tous les acc\u00E8s sur les \u00E9l\u00E9ments de cours bas\u00E9 sur toutes les donn\u00E9es de cours par semaine.
 statistic.title=Statistiques hebdomadaires
diff --git a/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_it.properties
index 22a2efd3f14c4ccc92d8eda1eb482fec4bda9620..4cf094253f4fc319d0a5fc16dcfb972f462ad42a 100644
--- a/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_it.properties
+++ b/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_it.properties
@@ -8,8 +8,8 @@ menu.createstatfile=settimanale
 menu.createstatfile.alt=Mostrare statistica settimanale
 stat.table.header.node=Elemento di corso
 stat.table.header.total=Totale
-statistic.chart.intro=Questa grafica mostra tutti i clic {0} sulla base di tutti i dati disponibili (dal {1}) raggruppati per settimana.
+statistic.chart.intro=Questa grafica mostra tutti i clic {0} sulla base di tutti i dati disponibili raggruppati per settimana.
 statistic.chart.pernode.intro=Questa grafica mostra tutti i clic sugli elementi di studio nella settimana {0}.
-statistic.chart.pernode.total.intro=Questa grafica mostra tutti i clic sugli elementi di studio sulla base di tutti i dati disponibili (dal {0}).
-statistic.intro=Questa grafica mostra tutti i clic sugli elementi di corso sulla base di tutti i dati disponibili (dal {0}) per settimana.
+statistic.chart.pernode.total.intro=Questa grafica mostra tutti i clic sugli elementi di studio sulla base di tutti i dati disponibili.
+statistic.intro=Questa grafica mostra tutti i clic sugli elementi di corso sulla base di tutti i dati disponibili per settimana.
 statistic.title=Statistica settimanale
diff --git a/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_nl_NL.properties b/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_nl_NL.properties
index 3c5b1364782be7f91398cf909eab3fa109a6f996..adaa2d95259d2f01a69b3ff08764c84c243fa59c 100644
--- a/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_nl_NL.properties
+++ b/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_nl_NL.properties
@@ -8,8 +8,8 @@ menu.createstatfile=Wekelijks
 menu.createstatfile.alt=Toon wekelijkse statistieken
 stat.table.header.node=Cursuselement
 stat.table.header.total=Totaal
-statistic.chart.intro=Deze grafiek toont alle toegangen {0} gebaseerd op de volledige cursusdata beschikbaar (sinds {1}) en gesorteerd per week.
+statistic.chart.intro=Deze grafiek toont alle toegangen {0} gebaseerd op de volledige cursusdata beschikbaar en gesorteerd per week.
 statistic.chart.pernode.intro=Deze grafiek toont alle toegangen tot cursuselementen in week {0}.
-statistic.chart.pernode.total.intro=Deze grafiek toont alle toegangen tot cursuselementen gebaseerd op de volledige cursusdata beschikbaar (sinds {0}).
-statistic.intro=Deze statistiek toont alle toegangen tot cursuselementen gebaseerd op de volledige cursusdata beschikbaar (sinds {0}) per week.
+statistic.chart.pernode.total.intro=Deze grafiek toont alle toegangen tot cursuselementen gebaseerd op de volledige cursusdata beschikbaar.
+statistic.intro=Deze statistiek toont alle toegangen tot cursuselementen gebaseerd op de volledige cursusdata beschikbaar per week.
 statistic.title=Wekelijkse statistieken
diff --git a/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_pl.properties b/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_pl.properties
index 6892c048dd21a46dc4c2a5aa2523a9fcc66e2543..9362f1a6e947c56f9b450d560d1636fc705e15c2 100644
--- a/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_pl.properties
+++ b/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_pl.properties
@@ -5,8 +5,8 @@ menu.createstatfile=Tygodniowe
 menu.createstatfile.alt=Poka\u017C statystki tygodniowe
 stat.table.header.node=Element kursu
 stat.table.header.total=Og\u00F3\u0142em
-statistic.chart.intro=Ten wykres przedstawia wszystkie zapytania {0}, bazuj\u0105c na wszystkich dost\u0119pnych danych kursu (od {1}), posortowane wed\u0142ug tygodnia.
+statistic.chart.intro=Ten wykres przedstawia wszystkie zapytania {0}, bazuj\u0105c na wszystkich dost\u0119pnych danych kursu, posortowane wed\u0142ug tygodnia.
 statistic.chart.pernode.intro=Ten wykres przedstawia wszystkie zapytania do element\u00F3w kursu w tygodniu {0}.
-statistic.chart.pernode.total.intro=Ten wykres przedstawia wszystkie zapytania do element\u00F3w kursu, bazuj\u0105c na wszystkich dost\u0119pnych danych (od {0}).
-statistic.intro=Te statystyki przedstawiaj\u0105 wszystkie zapytania do element\u00F3w kursu, bazuj\u0105c na wszystkich dost\u0119pnych danych kursu (od {0}), tygodniowo.
+statistic.chart.pernode.total.intro=Ten wykres przedstawia wszystkie zapytania do element\u00F3w kursu, bazuj\u0105c na wszystkich dost\u0119pnych danych.
+statistic.intro=Te statystyki przedstawiaj\u0105 wszystkie zapytania do element\u00F3w kursu, bazuj\u0105c na wszystkich dost\u0119pnych danych kursu, tygodniowo.
 statistic.title=Statystyki tygodniowe
diff --git a/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_pt_BR.properties
index e67c117e866322c8f8ddf0db8b8b483ea00d0bb8..99e506ee023d665e6764caa08d622e7087b6938c 100644
--- a/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/course/statistic/weekly/_i18n/LocalStrings_pt_BR.properties
@@ -8,8 +8,8 @@ menu.createstatfile=Semanalmente
 menu.createstatfile.alt=Mostrar estat\u00EDsticas semanais
 stat.table.header.node=Elemento do Curso
 stat.table.header.total=Total
-statistic.chart.intro=Este gr\u00E1fico mostra todos os acessos {0} com base em todos os dados do curso dispon\u00EDvel (desde {1}) ordenados por semana.
+statistic.chart.intro=Este gr\u00E1fico mostra todos os acessos {0} com base em todos os dados do curso dispon\u00EDvel ordenados por semana.
 statistic.chart.pernode.intro=Este gr\u00E1fico mostra todos os acessos a elementos do curso em semanas {0}.
-statistic.chart.pernode.total.intro=Este gr\u00E1fico mostra todos os acessos a elementos do curso com base em todos os dados do curso dispon\u00EDvel (desde {0}).
-statistic.intro=Esta estat\u00EDstica mostra todos os acessos a elementos do curso com base em todos os dados dispon\u00EDveis (desde {0}) por semana.
+statistic.chart.pernode.total.intro=Este gr\u00E1fico mostra todos os acessos a elementos do curso com base em todos os dados do curso dispon\u00EDvel.
+statistic.intro=Esta estat\u00EDstica mostra todos os acessos a elementos do curso com base em todos os dados dispon\u00EDveis por semana.
 statistic.title=Estat\u00EDsticas Semanais
diff --git a/src/main/java/org/olat/ims/qti21/pool/QTI12To21HtmlHandler.java b/src/main/java/org/olat/ims/qti21/pool/QTI12To21HtmlHandler.java
index f1b086190d8fc49ba668aaf92089390bd664cda7..f8d2786d662d69354cad6e24ff944a7338a485e7 100644
--- a/src/main/java/org/olat/ims/qti21/pool/QTI12To21HtmlHandler.java
+++ b/src/main/java/org/olat/ims/qti21/pool/QTI12To21HtmlHandler.java
@@ -48,7 +48,7 @@ class QTI12To21HtmlHandler extends DefaultHandler {
 	private final XMLStreamWriter xtw;
 
 	private int subLevel = 0;
-	private Deque<String> skipTags = new ArrayDeque<String>();
+	private Deque<String> skipTags = new ArrayDeque<>();
 	private Map<String,String> materialsMapping = new HashMap<>();
 
 	private boolean envelopP = false;
@@ -157,6 +157,9 @@ class QTI12To21HtmlHandler extends DefaultHandler {
 				if(start < 0) {
 					start = 0;//Bug neko
 				}
+				if(start + length > ch.length) {
+					length = ch.length - start;// Make sure the length is correct
+				}
 				xtw.writeCharacters(ch, start, length);
 			} else {
 				xtw.writeCharacters(ch, start, length);
diff --git a/src/test/java/org/olat/course/statistic/SimpleStatisticInfoHelperTest.java b/src/test/java/org/olat/course/statistic/SimpleStatisticInfoHelperTest.java
deleted file mode 100644
index 1eae3605977f5786588f23176fbc2dc0b71dde5d..0000000000000000000000000000000000000000
--- a/src/test/java/org/olat/course/statistic/SimpleStatisticInfoHelperTest.java
+++ /dev/null
@@ -1,47 +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.course.statistic;
-
-import java.util.Date;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.olat.test.OlatTestCase;
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
- * 
- * 
- * 
- * Initial date: 5 mai 2017<br>
- * @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
- *
- */
-public class SimpleStatisticInfoHelperTest extends OlatTestCase {
-	
-	@Autowired
-	private SimpleStatisticInfoHelper infoHelper;
-	
-	@Test
-	public void getFirstLoggingTableCreationDate() {
-		Date firstLoggingDate = infoHelper.getFirstLoggingTableCreationDate();
-		Assert.assertNotNull(firstLoggingDate);
-	}
-}
diff --git a/src/test/java/org/olat/test/AllTestsJunit4.java b/src/test/java/org/olat/test/AllTestsJunit4.java
index eda7630cb016691c06d556a4b5ee060f987dd18f..5ce4090a62cdc2f777160ecd394bde7e817291d4 100644
--- a/src/test/java/org/olat/test/AllTestsJunit4.java
+++ b/src/test/java/org/olat/test/AllTestsJunit4.java
@@ -171,7 +171,6 @@ import org.junit.runners.Suite;
 	org.olat.course.statistic.DailyStatisticUpdateManagerTest.class,
 	org.olat.course.statistic.DayOfWeekStatisticUpdateManagerTest.class,
 	org.olat.course.statistic.HourOfDayStatisticUpdateManagerTest.class,
-	org.olat.course.statistic.SimpleStatisticInfoHelperTest.class,
 	org.olat.course.statistic.WeeklyStatisticUpdateManagerTest.class,
 	org.olat.modules.assessment.manager.AssessmentEntryDAOTest.class,
 	org.olat.course.certificate.manager.CertificatesManagerTest.class,