Merge branch 'master' into talmdal_dev

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

13 files changed, 0 insertions, 253 deletions

diff --git a/system/i18n/en_US/cache.php b/system/i18n/en_US/cache.php
deleted file mode 100644
index bef02793..00000000
--- a/system/i18n/en_US/cache.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php defined('SYSPATH') OR die('No direct access allowed.');
-
-$lang = array
-(
-	'undefined_group'      => 'The %s group is not defined in your configuration.',
-	'extension_not_loaded' => 'The %s PHP extension must be loaded to use this driver.',
-	'unwritable'           => 'The configured storage location, %s, is not writable.',
-	'resources'            => 'Caching of resources is impossible, because resources cannot be serialized.',
-	'driver_error'         => '%s',
-);
\ No newline at end of file
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
diff --git a/system/i18n/en_US/core.php b/system/i18n/en_US/core.php
deleted file mode 100644
index 9711b7cd..00000000
--- a/system/i18n/en_US/core.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php defined('SYSPATH') OR die('No direct access allowed.');
-
-$lang = array
-(
-	'there_can_be_only_one' => 'There can be only one instance of Kohana per page request',
-	'uncaught_exception'    => 'Uncaught %s: %s in file %s on line %s',
-	'invalid_method'        => 'Invalid method %s called in %s',
-	'invalid_property'      => 'The %s property does not exist in the %s class.',
-	'log_dir_unwritable'    => 'The log directory is not writable: %s',
-	'resource_not_found'    => 'The requested %s, %s, could not be found',
-	'invalid_filetype'      => 'The requested filetype, .%s, is not allowed in your view configuration file',
-	'view_set_filename'     => 'You must set the the view filename before calling render',
-	'no_default_route'      => 'Please set a default route in config/routes.php',
-	'no_controller'         => 'Kohana was not able to determine a controller to process this request: %s',
-	'page_not_found'        => 'The page you requested, %s, could not be found.',
-	'stats_footer'          => 'Loaded in {execution_time} seconds, using {memory_usage} of memory. Generated by Kohana v{kohana_version}.',
-	'error_file_line'       => '<tt>%s <strong>[%s]:</strong></tt>',
-	'stack_trace'           => 'Stack Trace',
-	'generic_error'         => 'Unable to Complete Request',
-	'errors_disabled'       => 'You can go to the <a href="%s">home page</a> or <a href="%s">try again</a>.',
-
-	// Drivers
-	'driver_implements'     => 'The %s driver for the %s library must implement the %s interface',
-	'driver_not_found'      => 'The %s driver for the %s library could not be found',
-
-	// Resource names
-	'config'                => 'config file',
-	'controller'            => 'controller',
-	'helper'                => 'helper',
-	'library'               => 'library',
-	'driver'                => 'driver',
-	'model'                 => 'model',
-	'view'                  => 'view',
-);
diff --git a/system/i18n/en_US/database.php b/system/i18n/en_US/database.php
deleted file mode 100644
index 172e5c90..00000000
--- a/system/i18n/en_US/database.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php defined('SYSPATH') OR die('No direct access allowed.');
-
-$lang = array
-(
-	'undefined_group'       => 'The %s group is not defined in your configuration.',
-	'error'                 => 'There was an SQL error: %s',
-	'connection'            => 'There was an error connecting to the database: %s',
-	'invalid_dsn'           => 'The DSN you supplied is not valid: %s',
-	'must_use_set'          => 'You must set a SET clause for your query.',
-	'must_use_where'        => 'You must set a WHERE clause for your query.',
-	'must_use_table'        => 'You must set a database table for your query.',
-	'table_not_found'       => 'Table %s does not exist in your database.',
-	'not_implemented'       => 'The method you called, %s, is not supported by this driver.',
-	'result_read_only'      => 'Query results are read only.'
-);
\ No newline at end of file
diff --git a/system/i18n/en_US/encrypt.php b/system/i18n/en_US/encrypt.php
deleted file mode 100644
index 9afd6208..00000000
--- a/system/i18n/en_US/encrypt.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php defined('SYSPATH') OR die('No direct access allowed.');
-
-$lang = array
-(
-	'undefined_group'   => 'The %s group is not defined in your configuration.',
-	'requires_mcrypt'   => 'To use the Encrypt library, mcrypt must be enabled in your PHP installation',
-	'no_encryption_key' => 'To use the Encrypt library, you must set an encryption key in your config file'
-);
diff --git a/system/i18n/en_US/errors.php b/system/i18n/en_US/errors.php
deleted file mode 100644
index 83341a2c..00000000
--- a/system/i18n/en_US/errors.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php defined('SYSPATH') OR die('No direct access allowed.');
-
-$lang = array
-(
-	E_KOHANA             => array( 1, 'Framework Error',   'Please check the Kohana documentation for information about the following error.'),
-	E_PAGE_NOT_FOUND     => array( 1, 'Page Not Found',    'The requested page was not found. It may have moved, been deleted, or archived.'),
-	E_DATABASE_ERROR     => array( 1, 'Database Error',    'A database error occurred while performing the requested procedure. Please review the database error below for more information.'),
-	E_RECOVERABLE_ERROR  => array( 1, 'Recoverable Error', 'An error was detected which prevented the loading of this page. If this problem persists, please contact the website administrator.'),
-	E_ERROR              => array( 1, 'Fatal Error',       ''),
-	E_USER_ERROR         => array( 1, 'Fatal Error',       ''),
-	E_PARSE              => array( 1, 'Syntax Error',      ''),
-	E_WARNING            => array( 1, 'Warning Message',   ''),
-	E_USER_WARNING       => array( 1, 'Warning Message',   ''),
-	E_STRICT             => array( 2, 'Strict Mode Error', ''),
-	E_NOTICE             => array( 2, 'Runtime Message',   ''),
-);
\ No newline at end of file
diff --git a/system/i18n/en_US/event.php b/system/i18n/en_US/event.php
deleted file mode 100644
index 282a0a25..00000000
--- a/system/i18n/en_US/event.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php defined('SYSPATH') OR die('No direct access allowed.');
-
-$lang = array
-(
-	'invalid_subject'  => 'Attempt to attach invalid subject %s to %s failed: Subjects must extend the Event_Subject class',
-	'invalid_observer' => 'Attempt to attach invalid observer %s to %s failed: Observers must extend the Event_Observer class',
-);
diff --git a/system/i18n/en_US/image.php b/system/i18n/en_US/image.php
deleted file mode 100644
index 9f184930..00000000
--- a/system/i18n/en_US/image.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php defined('SYSPATH') OR die('No direct access allowed.');
-
-$lang = array
-(
-	'getimagesize_missing'    => 'The Image library requires the getimagesize() PHP function, which is not available in your installation.',
-	'unsupported_method'      => 'Your configured driver does not support the %s image transformation.',
-	'file_not_found'          => 'The specified image, %s, was not found. Please verify that images exist by using file_exists() before manipulating them.',
-	'type_not_allowed'        => 'The specified image, %s, is not an allowed image type.',
-	'invalid_width'           => 'The width you specified, %s, is not valid.',
-	'invalid_height'          => 'The height you specified, %s, is not valid.',
-	'invalid_dimensions'      => 'The dimensions specified for %s are not valid.',
-	'invalid_master'          => 'The master dimension specified is not valid.',
-	'invalid_flip'            => 'The flip direction specified is not valid.',
-	'directory_unwritable'    => 'The specified directory, %s, is not writable.',
-
-	// ImageMagick specific messages
-	'imagemagick' => array
-	(
-		'not_found' => 'The ImageMagick directory specified does not contain a required program, %s.',
-	),
-	
-	// GraphicsMagick specific messages
-	'graphicsmagick' => array
-	(
-		'not_found' => 'The GraphicsMagick directory specified does not contain a required program, %s.',
-	),
-	
-	// GD specific messages
-	'gd' => array
-	(
-		'requires_v2' => 'The Image library requires GD2. Please see http://php.net/gd_info for more information.',
-	),
-);
diff --git a/system/i18n/en_US/orm.php b/system/i18n/en_US/orm.php
deleted file mode 100644
index 3c5720bc..00000000
--- a/system/i18n/en_US/orm.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php defined('SYSPATH') OR die('No direct access allowed.');
-
-$lang['query_methods_not_allowed'] = 'Query methods cannot be used through ORM';
\ No newline at end of file
diff --git a/system/i18n/en_US/profiler.php b/system/i18n/en_US/profiler.php
deleted file mode 100644
index a39c2f51..00000000
--- a/system/i18n/en_US/profiler.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php defined('SYSPATH') OR die('No direct access allowed.');
-
-$lang = array
-(
-	'benchmarks'   => 'Benchmarks',
-	'post_data'    => 'Post Data',
-	'no_post'      => 'No post data',
-	'session_data' => 'Session Data',
-	'no_session'   => 'No session data',
-	'queries'      => 'Database Queries',
-	'no_queries'   => 'No queries',
-	'no_database'  => 'Database not loaded',
-	'cookie_data'  => 'Cookie Data',
-	'no_cookie'    => 'No cookie data',
-);
diff --git a/system/i18n/en_US/session.php b/system/i18n/en_US/session.php
deleted file mode 100644
index ee781c65..00000000
--- a/system/i18n/en_US/session.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php defined('SYSPATH') OR die('No direct access allowed.');
-
-$lang = array
-(
-	'invalid_session_name' => 'The session_name, %s, is invalid. It must contain only alphanumeric characters and underscores. Also at least one letter must be present.',
-);
\ No newline at end of file
diff --git a/system/i18n/en_US/upload.php b/system/i18n/en_US/upload.php
deleted file mode 100644
index 7f6e216d..00000000
--- a/system/i18n/en_US/upload.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php defined('SYSPATH') OR die('No direct access allowed.');
-
-$lang = array
-(
-	'not_writable' => 'The upload destination folder, %s, does not appear to be writable.',
-);
\ No newline at end of file
diff --git a/system/i18n/en_US/validation.php b/system/i18n/en_US/validation.php
deleted file mode 100644
index d98e548f..00000000
--- a/system/i18n/en_US/validation.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php defined('SYSPATH') OR die('No direct access allowed.');
-
-$lang = array
-(
-	// Class errors
-	'invalid_rule'  => 'Invalid validation rule used: %s',
-	'i18n_array'    => 'The %s i18n key must be an array to be used with the in_lang rule',
-	'not_callable'  => 'Callback %s used for Validation is not callable',
-
-	// General errors
-	'unknown_error' => 'Unknown validation error while validating the %s field.',
-	'required'      => 'The %s field is required.',
-	'min_length'    => 'The %s field must be at least %d characters long.',
-	'max_length'    => 'The %s field must be %d characters or fewer.',
-	'exact_length'  => 'The %s field must be exactly %d characters.',
-	'in_array'      => 'The %s field must be selected from the options listed.',
-	'matches'       => 'The %s field must match the %s field.',
-	'valid_url'     => 'The %s field must contain a valid URL.',
-	'valid_email'   => 'The %s field must contain a valid email address.',
-	'valid_ip'      => 'The %s field must contain a valid IP address.',
-	'valid_type'    => 'The %s field must only contain %s characters.',
-	'range'         => 'The %s field must be between specified ranges.',
-	'regex'         => 'The %s field does not match accepted input.',
-	'depends_on'    => 'The %s field depends on the %s field.',
-
-	// Upload errors
-	'user_aborted'  => 'The %s file was aborted during upload.',
-	'invalid_type'  => 'The %s file is not an allowed file type.',
-	'max_size'      => 'The %s file you uploaded was too large. The maximum size allowed is %s.',
-	'max_width'     => 'The %s file you uploaded was too big. The maximum allowed width is %spx.',
-	'max_height'    => 'The %s file you uploaded was too big. The maximum allowed height is %spx.',
-	'min_width'     => 'The %s file you uploaded was too small. The minimum allowed width is %spx.',
-	'min_height'    => 'The %s file you uploaded was too small. The minimum allowed height is %spx.',
-
-	// Field types
-	'alpha'         => 'alphabetical',
-	'alpha_numeric' => 'alphabetical and numeric',
-	'alpha_dash'    => 'alphabetical, dash, and underscore',
-	'digit'         => 'digit',
-	'numeric'       => 'numeric',
-);