diff --git a/calendar/inc/class.calendar_boupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php
index 69a3e1f94e..400acbd460 100644
--- a/calendar/inc/class.calendar_boupdate.inc.php
+++ b/calendar/inc/class.calendar_boupdate.inc.php
@@ -1648,7 +1648,7 @@ class calendar_boupdate extends calendar_bo
 		);
 
 		$pri = Array(
-			0   => '',
+			0   => lang('None'),
 			1	=> lang('Low'),
 			2	=> lang('Normal'),
 			3	=> lang('High')
diff --git a/calendar/inc/class.calendar_export_csv.inc.php b/calendar/inc/class.calendar_export_csv.inc.php
index d2221b52fd..8e5f86dd44 100644
--- a/calendar/inc/class.calendar_export_csv.inc.php
+++ b/calendar/inc/class.calendar_export_csv.inc.php
@@ -356,7 +356,7 @@ class calendar_export_csv implements importexport_iface_export_plugin {
 	protected function get_selects()
 	{
 		$this->selects['priority'] = Array(
-			0 => '',
+			0 => lang('None'),
 			1 => lang('Low'),
 			2 => lang('Normal'),
 			3 => lang('High')
@@ -382,7 +382,7 @@ class calendar_export_csv implements importexport_iface_export_plugin {
 	 */
 	public function get_filter_fields(Array &$filters)
 	{
-		
+
 		// Calendar SO doesn't support filtering by column, so we have to remove pretty much everything
 		unset($filters['recur_date']);
 
diff --git a/calendar/inc/class.calendar_import_csv.inc.php b/calendar/inc/class.calendar_import_csv.inc.php
index 13108c4a95..925aca8f29 100644
--- a/calendar/inc/class.calendar_import_csv.inc.php
+++ b/calendar/inc/class.calendar_import_csv.inc.php
@@ -159,7 +159,7 @@ class calendar_import_csv implements importexport_iface_import_plugin  {
 
 		$lookups = array(
 			'priority'	=> Array(
-				0 => '',
+				0 => lang('None'),
 				1 => lang('Low'),
 				2 => lang('Normal'),
 				3 => lang('High')
diff --git a/calendar/inc/class.calendar_uiviews.inc.php b/calendar/inc/class.calendar_uiviews.inc.php
index cb518c6e6f..cc489e00c1 100644
--- a/calendar/inc/class.calendar_uiviews.inc.php
+++ b/calendar/inc/class.calendar_uiviews.inc.php
@@ -173,7 +173,7 @@ class calendar_uiviews extends calendar_ui
 			'daywise' => True,
 		);
 		$this->holidays = $this->bo->read_holidays($this->year);
-
+		array_push($this->holidays, $this->bo->read_holidays($this->year+1));
 		$this->check_owners_access();
 
 		if($GLOBALS['egw_info']['user']['preferences']['common']['enable_dragdrop'])
diff --git a/etemplate/inc/class.select_widget.inc.php b/etemplate/inc/class.select_widget.inc.php
index 0e46f97c0b..e1cd453568 100644
--- a/etemplate/inc/class.select_widget.inc.php
+++ b/etemplate/inc/class.select_widget.inc.php
@@ -124,7 +124,7 @@ class select_widget
 				break;
 
 			case 'select-priority':
-				$cell['sel_options'] = array('','low','normal','high');
+				$cell['sel_options'] = array('none','low','normal','high');
 				break;
 
 			case 'select-bool':	// equal to checkbox, can be used with nextmatch-customfilter to filter a boolean column