From ce2b69675075444c9e40b72bcdd42ab7edbbe633 Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@server-speed.net>
Date: Fri, 28 Jan 2011 22:51:06 +0100
Subject: update to CI 2.0

Signed-off-by: Florian Pritz <bluewind@server-speed.net>
---
 system/language/english/calendar_lang.php        | 66 ++++++++++++------------
 system/language/english/date_lang.php            |  1 +
 system/language/english/db_lang.php              |  3 +-
 system/language/english/email_lang.php           |  0
 system/language/english/form_validation_lang.php |  9 ++--
 system/language/english/ftp_lang.php             |  1 +
 system/language/english/imglib_lang.php          |  0
 system/language/english/index.html               |  0
 system/language/english/number_lang.php          |  0
 system/language/english/profiler_lang.php        |  5 +-
 system/language/english/scaffolding_lang.php     | 17 ------
 system/language/english/unit_test_lang.php       |  1 +
 system/language/english/upload_lang.php          |  0
 system/language/english/validation_lang.php      | 24 ---------
 system/language/index.html                       |  0
 15 files changed, 47 insertions(+), 80 deletions(-)
 mode change 100644 => 100755 system/language/english/calendar_lang.php
 mode change 100644 => 100755 system/language/english/date_lang.php
 mode change 100644 => 100755 system/language/english/db_lang.php
 mode change 100644 => 100755 system/language/english/email_lang.php
 mode change 100644 => 100755 system/language/english/form_validation_lang.php
 mode change 100644 => 100755 system/language/english/ftp_lang.php
 mode change 100644 => 100755 system/language/english/imglib_lang.php
 mode change 100644 => 100755 system/language/english/index.html
 mode change 100644 => 100755 system/language/english/number_lang.php
 mode change 100644 => 100755 system/language/english/profiler_lang.php
 delete mode 100644 system/language/english/scaffolding_lang.php
 mode change 100644 => 100755 system/language/english/unit_test_lang.php
 mode change 100644 => 100755 system/language/english/upload_lang.php
 delete mode 100644 system/language/english/validation_lang.php
 mode change 100644 => 100755 system/language/index.html

(limited to 'system/language')

diff --git a/system/language/english/calendar_lang.php b/system/language/english/calendar_lang.php
old mode 100644
new mode 100755
index e26f84930..3e6312361
--- a/system/language/english/calendar_lang.php
+++ b/system/language/english/calendar_lang.php
@@ -1,19 +1,19 @@
 <?php
 
 $lang['cal_su']			= "Su";
-$lang['cal_mo'] 		= "Mo";
-$lang['cal_tu'] 		= "Tu";
-$lang['cal_we'] 		= "We";
-$lang['cal_th'] 		= "Th";
-$lang['cal_fr'] 		= "Fr";
-$lang['cal_sa'] 		= "Sa";
-$lang['cal_sun'] 		= "Sun";
-$lang['cal_mon'] 		= "Mon";
-$lang['cal_tue'] 		= "Tue";
-$lang['cal_wed'] 		= "Wed";
-$lang['cal_thu'] 		= "Thu";
-$lang['cal_fri'] 		= "Fri";
-$lang['cal_sat'] 		= "Sat";
+$lang['cal_mo']			= "Mo";
+$lang['cal_tu']			= "Tu";
+$lang['cal_we']			= "We";
+$lang['cal_th']			= "Th";
+$lang['cal_fr']			= "Fr";
+$lang['cal_sa']			= "Sa";
+$lang['cal_sun']		= "Sun";
+$lang['cal_mon']		= "Mon";
+$lang['cal_tue']		= "Tue";
+$lang['cal_wed']		= "Wed";
+$lang['cal_thu']		= "Thu";
+$lang['cal_fri']		= "Fri";
+$lang['cal_sat']		= "Sat";
 $lang['cal_sunday']		= "Sunday";
 $lang['cal_monday']		= "Monday";
 $lang['cal_tuesday']	= "Tuesday";
@@ -21,30 +21,30 @@ $lang['cal_wednesday']	= "Wednesday";
 $lang['cal_thursday']	= "Thursday";
 $lang['cal_friday']		= "Friday";
 $lang['cal_saturday']	= "Saturday";
-$lang['cal_jan'] 		= "Jan";
-$lang['cal_feb'] 		= "Feb";
-$lang['cal_mar'] 		= "Mar";
-$lang['cal_apr'] 		= "Apr";
-$lang['cal_may'] 		= "May";
-$lang['cal_jun'] 		= "Jun";
-$lang['cal_jul'] 		= "Jul";
-$lang['cal_aug'] 		= "Aug";
-$lang['cal_sep'] 		= "Sep";
-$lang['cal_oct'] 		= "Oct";
-$lang['cal_nov'] 		= "Nov";
-$lang['cal_dec'] 		= "Dec";
-$lang['cal_january'] 	= "January";
-$lang['cal_february'] 	= "February";
-$lang['cal_march'] 		= "March";
+$lang['cal_jan']		= "Jan";
+$lang['cal_feb']		= "Feb";
+$lang['cal_mar']		= "Mar";
+$lang['cal_apr']		= "Apr";
+$lang['cal_may']		= "May";
+$lang['cal_jun']		= "Jun";
+$lang['cal_jul']		= "Jul";
+$lang['cal_aug']		= "Aug";
+$lang['cal_sep']		= "Sep";
+$lang['cal_oct']		= "Oct";
+$lang['cal_nov']		= "Nov";
+$lang['cal_dec']		= "Dec";
+$lang['cal_january']	= "January";
+$lang['cal_february']	= "February";
+$lang['cal_march']		= "March";
 $lang['cal_april']		= "April";
-$lang['cal_mayl'] 		= "May";
-$lang['cal_june'] 		= "June";
-$lang['cal_july'] 		= "July";
+$lang['cal_mayl']		= "May";
+$lang['cal_june']		= "June";
+$lang['cal_july']		= "July";
 $lang['cal_august']		= "August";
 $lang['cal_september']	= "September";
-$lang['cal_october'] 	= "October";
+$lang['cal_october']	= "October";
 $lang['cal_november']	= "November";
-$lang['cal_december'] 	= "December";
+$lang['cal_december']	= "December";
 
 
 /* End of file calendar_lang.php */
diff --git a/system/language/english/date_lang.php b/system/language/english/date_lang.php
old mode 100644
new mode 100755
index 628e55b1a..c0ace16ef
--- a/system/language/english/date_lang.php
+++ b/system/language/english/date_lang.php
@@ -56,5 +56,6 @@ $lang['UP1275']	= '(UTC +12:45) Chatham Islands Standard Time';
 $lang['UP13']	= '(UTC +13:00) Phoenix Islands Time, Tonga';
 $lang['UP14']	= '(UTC +14:00) Line Islands';
 
+
 /* End of file date_lang.php */
 /* Location: ./system/language/english/date_lang.php */
\ No newline at end of file
diff --git a/system/language/english/db_lang.php b/system/language/english/db_lang.php
old mode 100644
new mode 100755
index dc98afcad..79b82c73a
--- a/system/language/english/db_lang.php
+++ b/system/language/english/db_lang.php
@@ -6,8 +6,9 @@ $lang['db_unable_to_select'] = 'Unable to select the specified database: %s';
 $lang['db_unable_to_create'] = 'Unable to create the specified database: %s';
 $lang['db_invalid_query'] = 'The query you submitted is not valid.';
 $lang['db_must_set_table'] = 'You must set the database table to be used with your query.';
-$lang['db_must_set_database'] = 'You must set the database name in your database config file.';
 $lang['db_must_use_set'] = 'You must use the "set" method to update an entry.';
+$lang['db_must_use_index'] = 'You must specify an index to match on for batch updates.';
+$lang['db_batch_missing_index'] = 'One or more rows submitted for batch updating is missing the specified index.';
 $lang['db_must_use_where'] = 'Updates are not allowed unless they contain a "where" clause.';
 $lang['db_del_must_use_where'] = 'Deletes are not allowed unless they contain a "where" or "like" clause.';
 $lang['db_field_param_missing'] = 'To fetch fields requires the name of the table as a parameter.';
diff --git a/system/language/english/email_lang.php b/system/language/english/email_lang.php
old mode 100644
new mode 100755
diff --git a/system/language/english/form_validation_lang.php b/system/language/english/form_validation_lang.php
old mode 100644
new mode 100755
index 8a123f4bd..b01885091
--- a/system/language/english/form_validation_lang.php
+++ b/system/language/english/form_validation_lang.php
@@ -1,11 +1,11 @@
 <?php
 
-$lang['required'] 			= "The %s field is required.";
+$lang['required']			= "The %s field is required.";
 $lang['isset']				= "The %s field must have a value.";
 $lang['valid_email']		= "The %s field must contain a valid email address.";
-$lang['valid_emails'] 		= "The %s field must contain all valid email addresses.";
-$lang['valid_url'] 			= "The %s field must contain a valid URL.";
-$lang['valid_ip'] 			= "The %s field must contain a valid IP.";
+$lang['valid_emails']		= "The %s field must contain all valid email addresses.";
+$lang['valid_url']			= "The %s field must contain a valid URL.";
+$lang['valid_ip']			= "The %s field must contain a valid IP.";
 $lang['min_length']			= "The %s field must be at least %s characters in length.";
 $lang['max_length']			= "The %s field can not exceed %s characters in length.";
 $lang['exact_length']		= "The %s field must be exactly %s characters in length.";
@@ -15,6 +15,7 @@ $lang['alpha_dash']			= "The %s field may only contain alpha-numeric characters,
 $lang['numeric']			= "The %s field must contain only numbers.";
 $lang['is_numeric']			= "The %s field must contain only numeric characters.";
 $lang['integer']			= "The %s field must contain an integer.";
+$lang['regex_match']		= "The %s field is not in the correct format.";
 $lang['matches']			= "The %s field does not match the %s field.";
 $lang['is_natural']			= "The %s field must contain only positive numbers.";
 $lang['is_natural_no_zero']	= "The %s field must contain a number greater than zero.";
diff --git a/system/language/english/ftp_lang.php b/system/language/english/ftp_lang.php
old mode 100644
new mode 100755
index 42403b971..392b2b272
--- a/system/language/english/ftp_lang.php
+++ b/system/language/english/ftp_lang.php
@@ -7,6 +7,7 @@ $lang['ftp_unable_to_makdir']		= "Unable to create the directory you have specif
 $lang['ftp_unable_to_changedir']	= "Unable to change directories.";
 $lang['ftp_unable_to_chmod']		= "Unable to set file permissions.  Please check your path.  Note: This feature is only available in PHP 5 or higher.";
 $lang['ftp_unable_to_upload']		= "Unable to upload the specified file.  Please check your path.";
+$lang['ftp_unable_to_download']		= "Unable to download the specified file.  Please check your path.";
 $lang['ftp_no_source_file']			= "Unable to locate the source file.  Please check your path.";
 $lang['ftp_unable_to_rename']		= "Unable to rename the file.";
 $lang['ftp_unable_to_delete']		= "Unable to delete the file.";
diff --git a/system/language/english/imglib_lang.php b/system/language/english/imglib_lang.php
old mode 100644
new mode 100755
diff --git a/system/language/english/index.html b/system/language/english/index.html
old mode 100644
new mode 100755
diff --git a/system/language/english/number_lang.php b/system/language/english/number_lang.php
old mode 100644
new mode 100755
diff --git a/system/language/english/profiler_lang.php b/system/language/english/profiler_lang.php
old mode 100644
new mode 100755
index 7c40e3f3e..b6460fb83
--- a/system/language/english/profiler_lang.php
+++ b/system/language/english/profiler_lang.php
@@ -1,6 +1,6 @@
 <?php
 
-$lang['profiler_database']		  = 'DATABASE';
+$lang['profiler_database']		= 'DATABASE';
 $lang['profiler_controller_info'] = 'CLASS/METHOD';
 $lang['profiler_benchmarks']	= 'BENCHMARKS';
 $lang['profiler_queries']		= 'QUERIES';
@@ -8,12 +8,15 @@ $lang['profiler_get_data']		= 'GET DATA';
 $lang['profiler_post_data']		= 'POST DATA';
 $lang['profiler_uri_string']	= 'URI STRING';
 $lang['profiler_memory_usage']	= 'MEMORY USAGE';
+$lang['profiler_config']		= 'CONFIG VARIABLES';
+$lang['profiler_headers']		= 'HTTP HEADERS';
 $lang['profiler_no_db']			= 'Database driver is not currently loaded';
 $lang['profiler_no_queries']	= 'No queries were run';
 $lang['profiler_no_post']		= 'No POST data exists';
 $lang['profiler_no_get']		= 'No GET data exists';
 $lang['profiler_no_uri']		= 'No URI data exists';
 $lang['profiler_no_memory']		= 'Memory Usage Unavailable';
+$lang['profiler_no_profiles']	= 'No Profile data - all Profiler sections have been disabled.';
 
 /* End of file profiler_lang.php */
 /* Location: ./system/language/english/profiler_lang.php */
\ No newline at end of file
diff --git a/system/language/english/scaffolding_lang.php b/system/language/english/scaffolding_lang.php
deleted file mode 100644
index c4d54d5c6..000000000
--- a/system/language/english/scaffolding_lang.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-$lang['scaff_view_records']		= 'View Records';
-$lang['scaff_create_record']	= 'Create New Record';
-$lang['scaff_add']				= 'Add Data';
-$lang['scaff_view']				= 'View Data';
-$lang['scaff_edit']				= 'Edit';
-$lang['scaff_delete']			= 'Delete';
-$lang['scaff_view_all']			= 'View All';
-$lang['scaff_yes']				= 'Yes';
-$lang['scaff_no']				= 'No';
-$lang['scaff_no_data']			= 'No data exists for this table yet.';
-$lang['scaff_del_confirm']		= 'Are you sure you want to delete the following row:';
-
-
-/* End of file scaffolding_lang.php */
-/* Location: ./system/language/english/scaffolding_lang.php */
\ No newline at end of file
diff --git a/system/language/english/unit_test_lang.php b/system/language/english/unit_test_lang.php
old mode 100644
new mode 100755
index 45b5acf55..070bcd1f2
--- a/system/language/english/unit_test_lang.php
+++ b/system/language/english/unit_test_lang.php
@@ -18,6 +18,7 @@ $lang['ut_array']			= 'Array';
 $lang['ut_object']			= 'Object';
 $lang['ut_resource']		= 'Resource';
 $lang['ut_null']			= 'Null';
+$lang['ut_notes']			= 'Notes';
 
 
 /* End of file unit_test_lang.php */
diff --git a/system/language/english/upload_lang.php b/system/language/english/upload_lang.php
old mode 100644
new mode 100755
diff --git a/system/language/english/validation_lang.php b/system/language/english/validation_lang.php
deleted file mode 100644
index a287892fe..000000000
--- a/system/language/english/validation_lang.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-$lang['required'] 			= "The %s field is required.";
-$lang['isset']				= "The %s field must have a value.";
-$lang['valid_email']		= "The %s field must contain a valid email address.";
-$lang['valid_emails'] 		= "The %s field must contain all valid email addresses.";
-$lang['valid_url'] 			= "The %s field must contain a valid URL.";
-$lang['valid_ip'] 			= "The %s field must contain a valid IP.";
-$lang['min_length']			= "The %s field must be at least %s characters in length.";
-$lang['max_length']			= "The %s field can not exceed %s characters in length.";
-$lang['exact_length']		= "The %s field must be exactly %s characters in length.";
-$lang['alpha']				= "The %s field may only contain alphabetical characters.";
-$lang['alpha_numeric']		= "The %s field may only contain alpha-numeric characters.";
-$lang['alpha_dash']			= "The %s field may only contain alpha-numeric characters, underscores, and dashes.";
-$lang['numeric']			= "The %s field must contain a number.";
-$lang['is_numeric']			= "The %s field must contain a number.";
-$lang['integer']			= "The %s field must contain an integer.";
-$lang['matches']			= "The %s field does not match the %s field.";
-$lang['is_natural']			= "The %s field must contain a number.";
-$lang['is_natural_no_zero']	= "The %s field must contain a number greater than zero.";
-
-
-/* End of file validation_lang.php */
-/* Location: ./system/language/english/validation_lang.php */
\ No newline at end of file
diff --git a/system/language/index.html b/system/language/index.html
old mode 100644
new mode 100755
-- 
cgit v1.2.3-24-g4f1b