aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-19 06:36:06 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-19 06:36:06 +0100
commitcd49ec92e38044c0707e91500ec482b26ae7f166 (patch)
tree15aaf6cba0d52be3e7d26e9197d64ba94c9b3751
parent7b4cfffc03ddb68617fd71479866f3bf4f106768 (diff)
parentee39e3cf7268b260ac12d0dd8157a47fdd579ff0 (diff)
downloadvolse-hubzilla-cd49ec92e38044c0707e91500ec482b26ae7f166.tar.gz
volse-hubzilla-cd49ec92e38044c0707e91500ec482b26ae7f166.tar.bz2
volse-hubzilla-cd49ec92e38044c0707e91500ec482b26ae7f166.zip
Merge remote-tracking branch 'upstream/master'
-rw-r--r--include/widgets.php6
-rw-r--r--version.inc2
2 files changed, 4 insertions, 4 deletions
diff --git a/include/widgets.php b/include/widgets.php
index 2724b42aa..f979ef2c4 100644
--- 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'),
diff --git a/version.inc b/version.inc
index a1de68ee0..369ed3cb7 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-11-18.1220
+2015-11-18.1221