Merge over vendor code.

git-svn-id: http://gallery.svn.sourceforge.net/svnroot/gallery/trunk/eval/gx/gallery3/trunk@18408 57fcd75e-5312-0410-8df3-f5eb6fbb1595

1 files changed, 34 insertions, 0 deletions

diff --git a/kohana/i18n/en_US/core.php b/kohana/i18n/en_US/core.php
new file mode 100644
index 00000000..9f09c64c
--- /dev/null
+++ b/kohana/i18n/en_US/core.php
@@ -0,0 +1,34 @@
+<?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',
+);