Merge branch 'master' into talmdal_dev

Conflicts:
	modules/gallery/controllers/albums.php
	modules/gallery/controllers/movies.php
	modules/gallery/controllers/photos.php

1 files changed, 0 insertions, 59 deletions

diff --git a/system/i18n/en_US/calendar.php b/system/i18n/en_US/calendar.php
deleted file mode 100644
index 21dad220..00000000
--- a/system/i18n/en_US/calendar.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php defined('SYSPATH') OR die('No direct access allowed.');
-
-$lang = array
-(
-	// Two letter days
-	'su'        => 'Su',
-	'mo'        => 'Mo',
-	'tu'        => 'Tu',
-	'we'        => 'We',
-	'th'        => 'Th',
-	'fr'        => 'Fr',
-	'sa'        => 'Sa',
-
-	// Short day names
-	'sun'       => 'Sun',
-	'mon'       => 'Mon',
-	'tue'       => 'Tue',
-	'wed'       => 'Wed',
-	'thu'       => 'Thu',
-	'fri'       => 'Fri',
-	'sat'       => 'Sat',
-
-	// Long day names
-	'sunday'    => 'Sunday',
-	'monday'    => 'Monday',
-	'tuesday'   => 'Tuesday',
-	'wednesday' => 'Wednesday',
-	'thursday'  => 'Thursday',
-	'friday'    => 'Friday',
-	'saturday'  => 'Saturday',
-
-	// Short month names
-	'jan'       => 'Jan',
-	'feb'       => 'Feb',
-	'mar'       => 'Mar',
-	'apr'       => 'Apr',
-	'may'       => 'May',
-	'jun'       => 'Jun',
-	'jul'       => 'Jul',
-	'aug'       => 'Aug',
-	'sep'       => 'Sep',
-	'oct'       => 'Oct',
-	'nov'       => 'Nov',
-	'dec'       => 'Dec',
-
-	// Long month names
-	'january'   => 'January',
-	'february'  => 'February',
-	'march'     => 'March',
-	'april'     => 'April',
-	'mayl'      => 'May',
-	'june'      => 'June',
-	'july'      => 'July',
-	'august'    => 'August',
-	'september' => 'September',
-	'october'   => 'October',
-	'november'  => 'November',
-	'december'  => 'December'
-);
\ No newline at end of file