Changeset 3510 for trunk/system/i18n

Timestamp:

09/29/2008 06:16:37 AM (2 months ago)

Author:

edam

Message:

updated en_GB so it is now in line with en_US (and removed exec props from some of those files)

Location:

trunk/system/i18n/en_GB

Files:

• cache.php (modified) (1 prop)
• calendar.php (modified) (1 prop)
• core.php (modified) (1 diff, 1 prop)
• database.php (modified) (1 prop)
• encrypt.php (modified) (1 prop)
• errors.php (modified) (1 diff, 1 prop)
• image.php (modified) (1 prop)
• pagination.php (modified) (1 prop)
• profiler.php (modified) (1 prop)
• session.php (modified) (1 prop)
• swift.php (modified) (1 prop)
• upload.php (modified) (1 prop)
• validation.php (modified) (1 diff, 1 prop)

trunk/system/i18n/en_GB/core.php

@@ -18 +18 @@
         '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>.',
+        'errors_disabled'       => 'An error occurred during the loading of this page. You can go to the <a href="%s">home page</a> or <a href="%s">try again</a>. The error has been logged for review.',
 
         // Drivers

trunk/system/i18n/en_GB/errors.php

@@ -3 +3 @@
 $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',   ''),
+        E_KOHANA             => array( 1, 'Framework Error'),
+        E_PAGE_NOT_FOUND     => array( 1, 'Page Not Found'),
+        E_DATABASE_ERROR     => array( 1, 'Database Error'),
+        E_RECOVERABLE_ERROR  => array( 1, 'Recoverable Error'),
+        E_ERROR              => array( 1, 'Fatal Error'),
+        E_USER_ERROR         => array( 1, 'Fatal Error'),
+        E_PARSE              => array( 1, 'Parse Error'),
+        E_WARNING            => array( 1, 'Runtime Warning'),
+        E_USER_WARNING       => array( 1, 'Runtime Warning'),
+        E_STRICT             => array( 2, 'Strict Mode Error'),
+        E_NOTICE             => array( 2, 'Notice'),
+        E_USER_NOTICE        => array( 2, 'Notice'),
 );

trunk/system/i18n/en_GB/validation.php

@@ -3 +3 @@
 $lang = array
 (
-        // Class errors
-        'invalid_rule'  => 'Invalid validation rule used: %s',
+        'not_callable'  => 'Callback %s used for Validation is not callable',
 
         // General errors