Merge remote-tracking branch 'upstream/master'

2015-11-19 06:36:06 +01:00
parent 7b4cfffc03 ee39e3cf72
commit cd49ec92e3
2 changed files with 4 additions and 4 deletions
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -668,9 +668,9 @@ function widget_eventsmenu($arr) {

 	return replace_macros(get_markup_template('events_side.tpl'), array(
 		'$title' => t('Events Menu'),
-		'$day' => t('Day'),
-		'$week' => t('Week'),
-		'$month' => t('Month'),
+		'$day' => t('Day View'),
+		'$week' => t('Week View'),
+		'$month' => t('Month View'),
 		'$today' => t('Today'),
 		'$export' => t('Export'),
 		'$upload' => t('Import'),
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-11-18.1220
+2015-11-18.1221