diff --git a/WHATS_NEW.txt b/WHATS_NEW.txt
index 2d0365644..f1acccdc5 100644
--- a/WHATS_NEW.txt
+++ b/WHATS_NEW.txt
@@ -1,12 +1,12 @@
-* Ver. 2.1.0
-+ Various upgrades, too numerous to list here.
-+ Removed dependancy on ofc upload library due to vulnerability found.
--------------------------------------------------------------------------------
-* Ver. 2.0.2
-+ Fixed multiple giftcards issue per Bug #4 reported on Sourceforge where a
-  second giftcard added would have its balance set to $0 even if the sale did
-  not require the total of the second giftcard to pay the remaining amount due.
-+ Small code cleanup
--------------------------------------------------------------------------------
-* Upgrade to CodeIgniter 2.1.0
+* Ver. 2.1.0
++ Various upgrades, too numerous to list here.
++ Removed dependancy on ofc upload library due to vulnerability found.
+-------------------------------------------------------------------------------
+* Ver. 2.0.2
++ Fixed multiple giftcards issue per Bug #4 reported on Sourceforge where a
+  second giftcard added would have its balance set to $0 even if the sale did
+  not require the total of the second giftcard to pay the remaining amount due.
++ Small code cleanup
+-------------------------------------------------------------------------------
+* Upgrade to CodeIgniter 2.1.0
 * Various small improvements
\ No newline at end of file
diff --git a/application/config/autoload.php b/application/config/autoload.php
index fe5907cb9..9cd3f57ff 100644
--- a/application/config/autoload.php
+++ b/application/config/autoload.php
@@ -66,7 +66,6 @@ $autoload['libraries'] = array('database','form_validation','session','user_agen
 
 $autoload['helper'] = array('form','url','table','text','currency', 'html', 'download', 'directory');
 
-
 /*
 | -------------------------------------------------------------------
 |  Auto-load Config files
diff --git a/application/config/config.php b/application/config/config.php
index c5cd43a81..470cbf463 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -9,7 +9,7 @@
 |
 |
 */
-$config['application_version'] = '2.1.1';
+$config['application_version'] = '2.2.0_RC1';
 
 /*
 |--------------------------------------------------------------------------
@@ -262,7 +262,7 @@ $config['sess_expiration']		= 0;
 $config['sess_expire_on_close']	= FALSE;
 $config['sess_encrypt_cookie']	= FALSE;
 $config['sess_use_database']	= TRUE;
-$config['sess_table_name']		= 'sessions';
+$config['sess_table_name']		= 'ospos_sessions';
 $config['sess_match_ip']		= FALSE;
 $config['sess_match_useragent']	= FALSE;
 $config['sess_time_to_update']	= 300;
diff --git a/application/config/migration.php b/application/config/migration.php
index afa264562..f00855fd2 100644
--- a/application/config/migration.php
+++ b/application/config/migration.php
@@ -37,5 +37,4 @@ $config['migration_version'] = 0;
 $config['migration_path'] = APPPATH . 'migrations/';
 
 
-/* End of file migration.php */
-/* Location: ./application/config/migration.php */
\ No newline at end of file
+/* End of file migration.php */
diff --git a/application/config/routes.php b/application/config/routes.php
index 3ba3f7aa0..331fff2ff 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -56,6 +56,7 @@ $route['reports/specific_customer'] = "reports/specific_customer_input";
 $route['reports/specific_employee'] = "reports/specific_employee_input";
 $route['reports/specific_discount'] = "reports/specific_discount_input";
 
+$route['scaffolding_trigger'] = "";
 
 $route['404_override'] = 'errors/page_missing';
 
diff --git a/application/controllers/items.php b/application/controllers/items.php
index ad91bb66d..7f5b504f0 100644
--- a/application/controllers/items.php
+++ b/application/controllers/items.php
@@ -178,6 +178,7 @@ class Items extends Secure_area implements iData_controller
 		$suggestions = $this->Item->get_custom10_suggestions($this->input->post('q'));
 		echo implode("\n",$suggestions);
 	}
+
 /**END GARRISON ADDED**/
 		
 	function get_row()
@@ -270,6 +271,7 @@ class Items extends Secure_area implements iData_controller
 		'allow_alt_description'=>$this->input->post('allow_alt_description'),
 		'is_serialized'=>$this->input->post('is_serialized'),
 		'deleted'=>$this->input->post('is_deleted'),  /** Parq 131215 **/
+
 		'custom1'=>$this->input->post('custom1'),	/**GARRISON ADDED 4/21/2013**/			
 		'custom2'=>$this->input->post('custom2'),/**GARRISON ADDED 4/21/2013**/
 		'custom3'=>$this->input->post('custom3'),/**GARRISON ADDED 4/21/2013**/
diff --git a/application/controllers/receivings.php b/application/controllers/receivings.php
index 766fe1c02..7945064d7 100644
--- a/application/controllers/receivings.php
+++ b/application/controllers/receivings.php
@@ -193,5 +193,5 @@ class Receivings extends Secure_area
     	$this->_reload();
     }
 
-}
+}
 ?>
\ No newline at end of file
diff --git a/application/controllers/reports.php b/application/controllers/reports.php
index 560f16c76..4e1e0fc1f 100644
--- a/application/controllers/reports.php
+++ b/application/controllers/reports.php
@@ -787,7 +787,7 @@ class Reports extends Secure_area
 
 		$this->load->view("reports/tabular_details",$data);
 	}
-
+	
 	function detailed_receivings($start_date, $end_date, $sale_type, $export_excel=0)
 	{
 		$this->load->model('reports/Detailed_receivings');
diff --git a/application/controllers/suppliers.php b/application/controllers/suppliers.php
index 684e4c685..ba8ebf57b 100644
--- a/application/controllers/suppliers.php
+++ b/application/controllers/suppliers.php
@@ -127,5 +127,5 @@ class Suppliers extends Person_controller
 	{			
 		return 360;
 	}
-}
+}
 ?>
\ No newline at end of file
diff --git a/application/.htaccess b/application/language/.htaccess
similarity index 100%
rename from application/.htaccess
rename to application/language/.htaccess
diff --git a/application/language/en/common_lang.php b/application/language/en/common_lang.php
index 3ddf42837..5b430fd63 100644
--- a/application/language/en/common_lang.php
+++ b/application/language/en/common_lang.php
@@ -1,41 +1,41 @@
 <?php
-$lang['common_common']='common';
-$lang['common_submit']='Submit';
-$lang['common_or']='OR';
-$lang['common_powered_by']='Powered by';
-$lang['common_welcome']='Welcome';
-$lang['common_logout']='Logout';
-$lang['common_list_of']='List of';
-$lang['common_first_name']='First Name';
-$lang['common_last_name']='Last Name';
-$lang['common_email']='E-Mail';
-$lang['common_phone_number']='Phone Number';
-$lang['common_address_1']='Address 1';
-$lang['common_address_2']='Address 2';
-$lang['common_city']='City';
-$lang['common_state']='State';
-$lang['common_zip']='Zip';
-$lang['common_country']='Country';
-$lang['common_comments']='Comments';
-$lang['common_edit']='edit';
-$lang['common_search']='Search';
-$lang['common_delete']='Delete';
-$lang['common_remove']='Remove';
-$lang['common_view_recent_sales']='View Recent Sales';
-$lang['common_you_are_using_ospos']='You are using Open Source Point Of Sale Version';
-$lang['common_please_visit_my']='Please visit my';
-$lang['common_website']='website';
-$lang['common_fields_required_message']='Fields in red are required';
-$lang['common_learn_about_project']='to learn the lastest information about the project';
-$lang['common_searched_for']='Searched for';
-$lang['common_first_name_required']='The first name is a required field.';
-$lang['common_last_name_required']='The last name is a required field';
-$lang['common_email_invalid_format']='The e-mail address is not in the proper format';
-$lang['common_confirm_search']='You have selected one or more rows, these will no longer be selected after your search. Are you sure you want to submit this search?';
-$lang['common_no_persons_to_display']='There are no people to display';
-$lang['common_return_policy']='Return Policy';
-$lang['common_price']='Price';
+$lang['common_common'] = 'common';
+$lang['common_submit'] = 'Submit';
+$lang['common_or'] = 'OR';
+$lang['common_powered_by'] = 'Powered by';
+$lang['common_welcome'] = 'Welcome';
+$lang['common_logout'] = 'Logout';
+$lang['common_list_of'] = 'List of';
+$lang['common_first_name'] = 'First Name';
+$lang['common_last_name'] = 'Last Name';
+$lang['common_email'] = 'E-Mail';
+$lang['common_phone_number'] = 'Phone Number';
+$lang['common_address_1'] = 'Address 1';
+$lang['common_address_2'] = 'Address 2';
+$lang['common_city'] = 'City';
+$lang['common_state'] = 'State';
+$lang['common_zip'] = 'Zip';
+$lang['common_country'] = 'Country';
+$lang['common_comments'] = 'Comments';
+$lang['common_edit'] = 'edit';
+$lang['common_search'] = 'Search';
+$lang['common_delete'] = 'Delete';
+$lang['common_remove'] = 'Remove';
+$lang['common_view_recent_sales'] = 'View Recent Sales';
+$lang['common_you_are_using_ospos'] = 'You are using Open Source Point Of Sale Version';
+$lang['common_please_visit_my'] = 'Please visit my';
+$lang['common_website'] = 'website';
+$lang['common_fields_required_message'] = 'Fields in red are required';
+$lang['common_learn_about_project'] = 'to learn the lastest information about the project';
+$lang['common_searched_for'] = 'Searched for';
+$lang['common_first_name_required'] = 'The first name is a required field.';
+$lang['common_last_name_required'] = 'The last name is a required field';
+$lang['common_email_invalid_format'] = 'The e-mail address is not in the proper format';
+$lang['common_confirm_search'] = 'You have selected one or more rows, these will no longer be selected after your search. Are you sure you want to submit this search?';
+$lang['common_no_persons_to_display'] = 'There are no people to display';
+$lang['common_return_policy'] = 'Return Policy';
+$lang['common_price'] = 'Price';
 $lang['common_welcome_message']= 'Welcome to Open Source Point Of Sale, click a module below to get started!';
-$lang['common_inv']='inv';
-$lang['common_det']='details';
+$lang['common_inv'] = 'inv';
+$lang['common_det'] = 'details';
 ?>
\ No newline at end of file
diff --git a/application/language/en/config_lang.php b/application/language/en/config_lang.php
index 6c7686880..6f9a5a8ac 100644
--- a/application/language/en/config_lang.php
+++ b/application/language/en/config_lang.php
@@ -1,23 +1,23 @@
 <?php
-$lang['config_info']='Store Configuration Information';
-$lang['config_company']='Company Name';
-$lang['config_address']='Company Address';
-$lang['config_phone']='Company Phone';
-$lang['config_website']='Website';
-$lang['config_fax']='Fax';
-$lang['config_default_tax_rate']='Default Tax Rate %';
-$lang['config_default_tax_rate_1']='Tax 1 Rate';
-$lang['config_default_tax_rate_2']='Tax 2 Rate';
-$lang['config_company_required']='Company name is a required field';
-$lang['config_address_required']='Company address is a required field';
-$lang['config_phone_required']='Company phone is a required field';
-$lang['config_default_tax_rate_required']='The default tax rate is a required field';
-$lang['config_default_tax_rate_number']='The default tax rate must be a number';
-$lang['config_company_website_url']='Company website is not a valid URL (http://...)';
-$lang['config_saved_successfully']='Configuration saved successfully';
-$lang['config_saved_unsuccessfully']='Configuration saved unsuccessfully';
-$lang['config_return_policy_required']='Return policy is a required field';
-$lang['config_print_after_sale']='Print receipt after sale';
+$lang['config_info'] = 'Store Configuration Information';
+$lang['config_company'] = 'Company Name';
+$lang['config_address'] = 'Company Address';
+$lang['config_phone'] = 'Company Phone';
+$lang['config_website'] = 'Website';
+$lang['config_fax'] = 'Fax';
+$lang['config_default_tax_rate'] = 'Default Tax Rate %';
+$lang['config_default_tax_rate_1'] = 'Tax 1 Rate';
+$lang['config_default_tax_rate_2'] = 'Tax 2 Rate';
+$lang['config_company_required'] = 'Company name is a required field';
+$lang['config_address_required'] = 'Company address is a required field';
+$lang['config_phone_required'] = 'Company phone is a required field';
+$lang['config_default_tax_rate_required'] = 'The default tax rate is a required field';
+$lang['config_default_tax_rate_number'] = 'The default tax rate must be a number';
+$lang['config_company_website_url'] = 'Company website is not a valid URL (http://...)';
+$lang['config_saved_successfully'] = 'Configuration saved successfully';
+$lang['config_saved_unsuccessfully'] = 'Configuration saved unsuccessfully';
+$lang['config_return_policy_required'] = 'Return policy is a required field';
+$lang['config_print_after_sale'] = 'Print receipt after sale';
 $lang['config_language'] = 'Language';
 $lang['config_timezone'] = 'Timezone';
 $lang['config_currency_symbol'] = 'Currency Symbol';
diff --git a/application/language/en/customers_lang.php b/application/language/en/customers_lang.php
index d6978d458..3f8804144 100644
--- a/application/language/en/customers_lang.php
+++ b/application/language/en/customers_lang.php
@@ -1,16 +1,16 @@
 <?php
-$lang['customers_new']='New Customer';
-$lang['customers_customer']='Customer';
-$lang['customers_update']='Update Customer';
-$lang['customers_confirm_delete']='Are you sure you want to delete the selected customers?';
-$lang['customers_none_selected']='You have not selected any customers to delete';
+$lang['customers_new'] = 'New Customer';
+$lang['customers_customer'] = 'Customer';
+$lang['customers_update'] = 'Update Customer';
+$lang['customers_confirm_delete'] = 'Are you sure you want to delete the selected customers?';
+$lang['customers_none_selected'] = 'You have not selected any customers to delete';
 $lang['customers_error_adding_updating'] = 'Error adding/updating customer';
-$lang['customers_successful_adding']='You have successfully added customer';
-$lang['customers_successful_updating']='You have successfully updated customer';
-$lang['customers_successful_deleted']='You have successfully deleted';
-$lang['customers_one_or_multiple']='customer(s)';
-$lang['customers_cannot_be_deleted']='Could not deleted selected customers, one or more of the selected customers has sales.';
-$lang['customers_basic_information']='Customer Information';
-$lang['customers_account_number']='Account #';
-$lang['customers_taxable']='Taxable';
+$lang['customers_successful_adding'] = 'You have successfully added customer';
+$lang['customers_successful_updating'] = 'You have successfully updated customer';
+$lang['customers_successful_deleted'] = 'You have successfully deleted';
+$lang['customers_one_or_multiple'] = 'customer(s)';
+$lang['customers_cannot_be_deleted'] = 'Could not deleted selected customers, one or more of the selected customers has sales.';
+$lang['customers_basic_information'] = 'Customer Information';
+$lang['customers_account_number'] = 'Account #';
+$lang['customers_taxable'] = 'Taxable';
 ?>
diff --git a/application/language/en/employees_lang.php b/application/language/en/employees_lang.php
index a30c32b99..f70776bd7 100644
--- a/application/language/en/employees_lang.php
+++ b/application/language/en/employees_lang.php
@@ -1,27 +1,26 @@
 <?php
-$lang['employees_employee']='Employee';
-$lang['employees_new']='New Employee';
-$lang['employees_update']='Update Employee';
-$lang['employees_confirm_delete']='Are you sure you want to delete the selected employees?';
-$lang['employees_none_selected']='You have not selected any employees to delete';
+$lang['employees_employee'] = 'Employee';
+$lang['employees_new'] = 'New Employee';
+$lang['employees_update'] = 'Update Employee';
+$lang['employees_confirm_delete'] = 'Are you sure you want to delete the selected employees?';
+$lang['employees_none_selected'] = 'You have not selected any employees to delete';
 $lang['employees_error_adding_updating'] = 'Error adding/updating employee';
-$lang['employees_successful_adding']='You have successfully added employee';
-$lang['employees_successful_updating']='You have successfully updated employee';
-$lang['employees_successful_deleted']='You have successfully deleted';
-$lang['employees_one_or_multiple']='employee(s)';
-$lang['employees_cannot_be_deleted']='Could not deleted selected employees, one or more of the employees has processed sales or you are trying to delete yourself :)';
-$lang['employees_username']='Username';
-$lang['employees_password']='Password';
-$lang['employees_repeat_password']='Password Again';
-$lang['employees_username_required']='Username is a required field';
-$lang['employees_username_minlength']='The username must be at least 5 characters';
-$lang['employees_password_required']='Password is required';
-$lang['employees_password_minlength']='Passwords must be at least 8 characters';
-$lang['employees_password_must_match']='Passwords do not match';
-$lang['employees_basic_information']='Employee Basic Information';
-$lang['employees_login_info']='Employee Login Info';
-$lang['employees_permission_info']='Employee Permissions and Access';
-$lang['employees_permission_desc']='Check the boxes below to grant access to modules';
+$lang['employees_successful_adding'] = 'You have successfully added employee';
+$lang['employees_successful_updating'] = 'You have successfully updated employee';
+$lang['employees_successful_deleted'] = 'You have successfully deleted';
+$lang['employees_one_or_multiple'] = 'employee(s)';
+$lang['employees_cannot_be_deleted'] = 'Could not deleted selected employees, one or more of the employees has processed sales or you are trying to delete yourself :)';
+$lang['employees_username'] = 'Username';
+$lang['employees_password'] = 'Password';
+$lang['employees_repeat_password'] = 'Password Again';
+$lang['employees_username_required'] = 'Username is a required field';
+$lang['employees_username_minlength'] = 'The username must be at least 5 characters';
+$lang['employees_password_required'] = 'Password is required';
+$lang['employees_password_minlength'] = 'Passwords must be at least 8 characters';
+$lang['employees_password_must_match'] = 'Passwords do not match';
+$lang['employees_basic_information'] = 'Employee Basic Information';
+$lang['employees_login_info'] = 'Employee Login Info';
+$lang['employees_permission_info'] = 'Employee Permissions and Access';
+$lang['employees_permission_desc'] = 'Check the boxes below to grant access to modules';
 $lang['employees_error_updating_demo_admin'] = 'You can not change the demo admin user';
-$lang['employees_error_deleting_demo_admin'] = 'You can not delete the demo admin user';
 ?>
diff --git a/application/language/en/error_lang.php b/application/language/en/error_lang.php
index cfcd2f0c9..eedaaaac9 100644
--- a/application/language/en/error_lang.php
+++ b/application/language/en/error_lang.php
@@ -1,4 +1,4 @@
 <?php
-$lang['error_no_permission_module']='You do not have permission to access the module named';
-$lang['error_unknown']='unknown';
+$lang['error_no_permission_module'] = 'You do not have permission to access the module named';
+$lang['error_unknown'] = 'unknown';
 ?>
diff --git a/application/language/en/giftcards_lang.php b/application/language/en/giftcards_lang.php
index cfd96a74e..bc79fbc2d 100644
--- a/application/language/en/giftcards_lang.php
+++ b/application/language/en/giftcards_lang.php
@@ -1,65 +1,64 @@
 <?php
-$lang['giftcards_giftcard_number']='Giftcard Number';
-$lang['giftcards_card_value']='Value';
-$lang['giftcards_basic_information']='Giftcard Information';
-$lang['giftcards_number_required']='Giftcard Number is a required field';
-$lang['giftcards_value_required']='Giftcard Value is a required field';
-$lang['giftcards_number']='Giftcard Number must be a number';
-$lang['giftcards_value']='Giftcard Value must be a number';
-$lang['giftcards_person_id']='Customer';
-
-$lang['giftcards_retrive_giftcard_info']='Retrieve Giftcard Info';
-$lang['giftcards_description']='Description';
-$lang['giftcards_amazon']='Amazon';
-$lang['giftcards_upc_database']='UPC Database';
-$lang['giftcards_cannot_find_giftcard']='Cannot find any information about giftcard';
-$lang['giftcards_info_provided_by']='Info provided by';
-$lang['giftcards_number_information']='Giftcard Number';
-$lang['giftcards_new']='New Giftcard';
-$lang['giftcards_update']='Update Giftcard';
-$lang['giftcards_giftcard']='Giftcard';
-$lang['giftcards_edit_multiple_giftcards']='Editing Multiple Giftcards';
-$lang['giftcards_category']='Category';
-$lang['giftcards_cost_price']='Cost Price';
-$lang['giftcards_unit_price']='Unit Price';
-$lang['giftcards_tax_1']='Tax 1';
-$lang['giftcards_tax_2']='Tax 2';
+$lang['giftcards_giftcard_number'] = 'Giftcard Number';
+$lang['giftcards_card_value'] = 'Value';
+$lang['giftcards_basic_information'] = 'Giftcard Information';
+$lang['giftcards_number_required'] = 'Giftcard Number is a required field';
+$lang['giftcards_value_required'] = 'Giftcard Value is a required field';
+$lang['giftcards_number'] = 'Giftcard Number must be a number';
+$lang['giftcards_value'] = 'Giftcard Value must be a number';
+$lang['giftcards_person_id'] = 'Customer';
+$lang['giftcards_retrive_giftcard_info'] = 'Retrieve Giftcard Info';
+$lang['giftcards_description'] = 'Description';
+$lang['giftcards_amazon'] = 'Amazon';
+$lang['giftcards_upc_database'] = 'UPC Database';
+$lang['giftcards_cannot_find_giftcard'] = 'Cannot find any information about giftcard';
+$lang['giftcards_info_provided_by'] = 'Info provided by';
+$lang['giftcards_number_information'] = 'Giftcard Number';
+$lang['giftcards_new'] = 'New Giftcard';
+$lang['giftcards_update'] = 'Update Giftcard';
+$lang['giftcards_giftcard'] = 'Giftcard';
+$lang['giftcards_edit_multiple_giftcards'] = 'Editing Multiple Giftcards';
+$lang['giftcards_category'] = 'Category';
+$lang['giftcards_cost_price'] = 'Cost Price';
+$lang['giftcards_unit_price'] = 'Unit Price';
+$lang['giftcards_tax_1'] = 'Tax 1';
+$lang['giftcards_tax_2'] = 'Tax 2';
 $lang['giftcards_sales_tax_1'] = 'Sales Tax';
 $lang['giftcards_sales_tax_2'] = 'Sales Tax 2';
-$lang['giftcards_tax_percent']='Tax Percent';
-$lang['giftcards_tax_percents']='Tax Percent(s)';
-$lang['giftcards_reorder_level']='Reorder Level';
-$lang['giftcards_quantity']='Quantity';
-$lang['giftcards_no_giftcards_to_display']='No Giftcards to display';
-$lang['giftcards_bulk_edit']='Bulk Edit';
-$lang['giftcards_confirm_delete']='Are you sure you want to delete the selected giftcards?';
-$lang['giftcards_none_selected']='You have not selected any giftcards to edit';
-$lang['giftcards_confirm_bulk_edit']='Are you sure you want to edit all the giftcards selected?';
-$lang['giftcards_successful_bulk_edit']='You have successfully updated the selected giftcards';
-$lang['giftcards_error_updating_multiple']='Error updating giftcards';
-$lang['giftcards_edit_fields_you_want_to_update']='Edit the fields you want to edit for ALL selected giftcards';
+$lang['giftcards_tax_percent'] = 'Tax Percent';
+$lang['giftcards_tax_percents'] = 'Tax Percent(s)';
+$lang['giftcards_reorder_level'] = 'Reorder Level';
+$lang['giftcards_quantity'] = 'Quantity';
+$lang['giftcards_no_giftcards_to_display'] = 'No Giftcards to display';
+$lang['giftcards_bulk_edit'] = 'Bulk Edit';
+$lang['giftcards_confirm_delete'] = 'Are you sure you want to delete the selected giftcards?';
+$lang['giftcards_none_selected'] = 'You have not selected any giftcards to edit';
+$lang['giftcards_confirm_bulk_edit'] = 'Are you sure you want to edit all the giftcards selected?';
+$lang['giftcards_successful_bulk_edit'] = 'You have successfully updated the selected giftcards';
+$lang['giftcards_error_updating_multiple'] = 'Error updating giftcards';
+$lang['giftcards_edit_fields_you_want_to_update'] = 'Edit the fields you want to edit for ALL selected giftcards';
 $lang['giftcards_error_adding_updating'] = 'Error adding/updating giftcard';
-$lang['giftcards_successful_adding']='You have successfully added giftcard';
-$lang['giftcards_successful_updating']='You have successfully updated giftcard';
-$lang['giftcards_successful_deleted']='You have successfully deleted';
-$lang['giftcards_one_or_multiple']='giftcard(s)';
-$lang['giftcards_cannot_be_deleted']='Could not deleted selected giftcards, one or more of the selected giftcards has sales.';
+$lang['giftcards_successful_adding'] = 'You have successfully added giftcard';
+$lang['giftcards_successful_updating'] = 'You have successfully updated giftcard';
+$lang['giftcards_successful_deleted'] = 'You have successfully deleted';
+$lang['giftcards_one_or_multiple'] = 'giftcard(s)';
+$lang['giftcards_cannot_be_deleted'] = 'Could not deleted selected giftcards, one or more of the selected giftcards has sales.';
 $lang['giftcards_none'] = 'None';
 $lang['giftcards_supplier'] = 'Supplier';
 $lang['giftcards_generate_barcodes'] = 'Generate Barcodes';
 $lang['giftcards_must_select_giftcard_for_barcode'] = 'You must select at least 1 giftcard to generate barcodes';
 $lang['giftcards_excel_import_failed'] = 'Excel import failed';
-$lang['giftcards_allow_alt_desciption'] = 'Allow Alt Description';
+$lang['giftcards_allow_alt_description'] = 'Allow Alt Description';
 $lang['giftcards_is_serialized'] = 'Giftcard has Serial Number';
 $lang['giftcards_low_inventory_giftcards'] = 'Low Inventory Giftcards';
 $lang['giftcards_serialized_giftcards'] = 'Serialized Giftcards';
 $lang['giftcards_no_description_giftcards'] = 'No Description Giftcards';
-$lang['giftcards_inventory_comments']='Comments';
-$lang['giftcards_count']='Update Inventory';
-$lang['giftcards_details_count']='Inventory Count Details';
-$lang['giftcards_add_minus']='Inventory to add/subtract';
-$lang['giftcards_current_quantity']='Current Quantity';
-$lang['giftcards_quantity_required']='Quantity is a required field. Please Close ( X ) to cancel';
+$lang['giftcards_inventory_comments'] = 'Comments';
+$lang['giftcards_count'] = 'Update Inventory';
+$lang['giftcards_details_count'] = 'Inventory Count Details';
+$lang['giftcards_add_minus'] = 'Inventory to add/subtract';
+$lang['giftcards_current_quantity'] = 'Current Quantity';
+$lang['giftcards_quantity_required'] = 'Quantity is a required field. Please Close ( X ) to cancel';
 $lang['giftcards_do_nothing'] = 'Do Nothing';
 $lang['giftcards_change_all_to_serialized'] = 'Change All To Serialized';
 $lang['giftcards_change_all_to_unserialized'] = 'Change All To Unserialized';
diff --git a/application/language/en/items_lang.php b/application/language/en/items_lang.php
index 7535f42bb..84a3118ad 100644
--- a/application/language/en/items_lang.php
+++ b/application/language/en/items_lang.php
@@ -1,73 +1,73 @@
 <?php
-$lang['items_item_number']='UPC/EAN/ISBN';
-$lang['items_retrive_item_info']='Retrive Item Info';
-$lang['items_description']='Description';
-$lang['items_amazon']='Amazon';
-$lang['items_upc_database']='UPC Database';
-$lang['items_cannot_find_item']='Cannot find any information about item';
-$lang['items_info_provided_by']='Info provided by';
-$lang['items_basic_information']='Item Information';
-$lang['items_number_information']='Item Number';
-$lang['items_new']='New Item';
-$lang['items_update']='Update Item';
-$lang['items_item']='Item';
-$lang['items_edit_multiple_items']='Editing Multiple Items';
-$lang['items_name']='Item Name';
-$lang['items_category']='Category';
-$lang['items_cost_price']='Wholesale Price';//GARRISON ADDED 4/21/2013
-$lang['items_unit_price']='Retail Price';//GARRISON ADDED 4/21/2013
-$lang['items_tax_1']='Tax 1';
-$lang['items_tax_2']='Tax 2';
+$lang['items_item_number'] = 'UPC/EAN/ISBN';
+$lang['items_retrive_item_info'] = 'Retrive Item Info';
+$lang['items_description'] = 'Description';
+$lang['items_amazon'] = 'Amazon';
+$lang['items_upc_database'] = 'UPC Database';
+$lang['items_cannot_find_item'] = 'Cannot find any information about item';
+$lang['items_info_provided_by'] = 'Info provided by';
+$lang['items_basic_information'] = 'Item Information';
+$lang['items_number_information'] = 'Item Number';
+$lang['items_new'] = 'New Item';
+$lang['items_update'] = 'Update Item';
+$lang['items_item'] = 'Item';
+$lang['items_edit_multiple_items'] = 'Editing Multiple Items';
+$lang['items_name'] = 'Item Name';
+$lang['items_category'] = 'Category';
+$lang['items_cost_price'] = 'Wholesale Price';//GARRISON ADDED 4/21/2013
+$lang['items_unit_price'] = 'Retail Price';//GARRISON ADDED 4/21/2013
+$lang['items_tax_1'] = 'Tax 1';
+$lang['items_tax_2'] = 'Tax 2';
 $lang['items_sales_tax_1'] = 'Sales Tax';
 $lang['items_sales_tax_2'] = 'Sales Tax 2';
-$lang['items_tax_percent']='Tax Percent';
-$lang['items_tax_percents']='Tax Percent(s)';
-$lang['items_reorder_level']='Reorder Level';
-$lang['items_quantity']='Quantity';
-$lang['items_reorder_level']='Reorder Level';
-$lang['items_no_items_to_display']='No Items to display';
-$lang['items_bulk_edit']='Bulk Edit';
-$lang['items_confirm_delete']='Are you sure you want to delete the selected items?';
-$lang['items_none_selected']='You have not selected any items to edit';
-$lang['items_confirm_bulk_edit']='Are you sure you want to edit all the items selected?';
-$lang['items_successful_bulk_edit']='You have successfully updated the selected items';
-$lang['items_error_updating_multiple']='Error updating items';
-$lang['items_edit_fields_you_want_to_update']='Edit the fields you want to edit for ALL selected items';
+$lang['items_tax_percent'] = 'Tax Percent';
+$lang['items_tax_percents'] = 'Tax Percent(s)';
+$lang['items_reorder_level'] = 'Reorder Level';
+$lang['items_quantity'] = 'Quantity';
+$lang['items_reorder_level'] = 'Reorder Level';
+$lang['items_no_items_to_display'] = 'No Items to display';
+$lang['items_bulk_edit'] = 'Bulk Edit';
+$lang['items_confirm_delete'] = 'Are you sure you want to delete the selected items?';
+$lang['items_none_selected'] = 'You have not selected any items to edit';
+$lang['items_confirm_bulk_edit'] = 'Are you sure you want to edit all the items selected?';
+$lang['items_successful_bulk_edit'] = 'You have successfully updated the selected items';
+$lang['items_error_updating_multiple'] = 'Error updating items';
+$lang['items_edit_fields_you_want_to_update'] = 'Edit the fields you want to edit for ALL selected items';
 $lang['items_error_adding_updating'] = 'Error adding/updating item';
-$lang['items_successful_adding']='You have successfully added item';
-$lang['items_successful_updating']='You have successfully updated item';
-$lang['items_successful_deleted']='You have successfully deleted';
-$lang['items_one_or_multiple']='item(s)';
-$lang['items_cannot_be_deleted']='Could not deleted selected items, one or more of the selected items has sales.';
-$lang['items_name_required']='Item Name is a required field';
-$lang['items_category_required']='Category is a required field';
-$lang['items_buy_price_required']='Purchase price is a required field';		//GARRISON UPDATED 6/3/2013
-$lang['items_unit_price_required']='Retail Price is a required field';		//GARRISON UPDATED 6/3/2013
-$lang['items_cost_price_required']='Wholesale Price is a required field';	//GARRISON UPDATED 6/3/2013
-$lang['items_tax_percent_required']='Tax Percent is a required field';
-$lang['items_quantity_required']='Quantity is a required field';
-$lang['items_reorder_level_required']='Reorder level is a required field';
-$lang['items_unit_price_number']='Unit price must be a number';
-$lang['items_cost_price_number']='Cost price must be a number';
-$lang['items_quantity_number']='Quantity must be a number';
-$lang['items_reorder_level_number']='Reorder level must be a number';
+$lang['items_successful_adding'] = 'You have successfully added item';
+$lang['items_successful_updating'] = 'You have successfully updated item';
+$lang['items_successful_deleted'] = 'You have successfully deleted';
+$lang['items_one_or_multiple'] = 'item(s)';
+$lang['items_cannot_be_deleted'] = 'Could not deleted selected items, one or more of the selected items has sales.';
+$lang['items_name_required'] = 'Item Name is a required field';
+$lang['items_category_required'] = 'Category is a required field';
+$lang['items_buy_price_required'] = 'Purchase price is a required field';		//GARRISON UPDATED 6/3/2013
+$lang['items_unit_price_required'] = 'Retail Price is a required field';		//GARRISON UPDATED 6/3/2013
+$lang['items_cost_price_required'] = 'Wholesale Price is a required field';	//GARRISON UPDATED 6/3/2013
+$lang['items_tax_percent_required'] = 'Tax Percent is a required field';
+$lang['items_quantity_required'] = 'Quantity is a required field';
+$lang['items_reorder_level_required'] = 'Reorder level is a required field';
+$lang['items_unit_price_number'] = 'Unit price must be a number';
+$lang['items_cost_price_number'] = 'Cost price must be a number';
+$lang['items_quantity_number'] = 'Quantity must be a number';
+$lang['items_reorder_level_number'] = 'Reorder level must be a number';
 $lang['items_none'] = 'None';
 $lang['items_supplier'] = 'Supplier';
 $lang['items_generate_barcodes'] = 'Generate Barcodes';
 $lang['items_must_select_item_for_barcode'] = 'You must select at least 1 item to generate barcodes';
 $lang['items_excel_import_failed'] = 'Excel import failed';
-$lang['items_allow_alt_desciption'] = 'Allow Alt Description';
+$lang['items_allow_alt_description'] = 'Allow Alt Description';
 $lang['items_is_serialized'] = 'Item has Serial Number';
 $lang['items_low_inventory_items'] = 'Low Inventory Items';
 $lang['items_serialized_items'] = 'Serialized Items';
 $lang['items_no_description_items'] = 'No Description Items';
 $lang['items_search_custom_items'] = 'Search Custom Fields';//GARRISON ADDED
-$lang['items_inventory_comments']='Comments';
-$lang['items_count']='Update Inventory';
-$lang['items_details_count']='Inventory Count Details';
-$lang['items_add_minus']='Inventory to add/subtract';
-$lang['items_current_quantity']='Current Quantity';
-$lang['items_quantity_required']='Quantity is a required field. Please Close ( X ) to cancel';
+$lang['items_inventory_comments'] = 'Comments';
+$lang['items_count'] = 'Update Inventory';
+$lang['items_details_count'] = 'Inventory Count Details';
+$lang['items_add_minus'] = 'Inventory to add/subtract';
+$lang['items_current_quantity'] = 'Current Quantity';
+$lang['items_quantity_required'] = 'Quantity is a required field. Please Close ( X ) to cancel';
 $lang['items_do_nothing'] = 'Do Nothing';
 $lang['items_change_all_to_serialized'] = 'Change All To Serialized';
 $lang['items_change_all_to_unserialized'] = 'Change All To Unserialized';
@@ -77,4 +77,5 @@ $lang['items_use_inventory_menu'] = 'Use Inv. Menu';
 $lang['items_manually_editing_of_quantity'] = 'Manual Edit of Quantity';
 $lang['items_inventory'] = 'Inventory';
 $lang['items_location'] = 'Location';
+$lang['items_is_deleted'] = 'Deleted';// Parq 131215
 ?>
diff --git a/application/language/en/receivings_lang.php b/application/language/en/receivings_lang.php
index 2564d4d42..5212e5b22 100644
--- a/application/language/en/receivings_lang.php
+++ b/application/language/en/receivings_lang.php
@@ -1,26 +1,26 @@
 <?php
-$lang['recvs_register']='Items Receiving';
-$lang['recvs_mode']='Receiving Mode';
-$lang['recvs_receiving']='Receive';
-$lang['recvs_return']='Return';
-$lang['recvs_total']='Total';
-$lang['recvs_cost']='Cost';
-$lang['recvs_quantity']='Qty.';
-$lang['recvs_discount']='Disc %';
-$lang['recvs_edit']='Edit';
+$lang['recvs_register'] = 'Items Receiving';
+$lang['recvs_mode'] = 'Receiving Mode';
+$lang['recvs_receiving'] = 'Receive';
+$lang['recvs_return'] = 'Return';
+$lang['recvs_total'] = 'Total';
+$lang['recvs_cost'] = 'Cost';
+$lang['recvs_quantity'] = 'Qty.';
+$lang['recvs_discount'] = 'Disc %';
+$lang['recvs_edit'] = 'Edit';
 $lang['recvs_new_supplier'] = 'New Supplier';
 $lang['recvs_supplier'] = 'Supplier';
-$lang['recvs_select_supplier']='Select Supplier (Optional)';
-$lang['recvs_start_typing_supplier_name']='Start Typing supplier\'s name...';
-$lang['recvs_unable_to_add_item']='Unable to add item to receiving';
-$lang['recvs_error_editing_item']='Error editing item';
-$lang['recvs_receipt']='Receivings Receipt';
-$lang['recvs_complete_receiving']='Finish';
+$lang['recvs_select_supplier'] = 'Select Supplier (Optional)';
+$lang['recvs_start_typing_supplier_name'] = 'Start Typing supplier\'s name...';
+$lang['recvs_unable_to_add_item'] = 'Unable to add item to receiving';
+$lang['recvs_error_editing_item'] = 'Error editing item';
+$lang['recvs_receipt'] = 'Receivings Receipt';
+$lang['recvs_complete_receiving'] = 'Finish';
 $lang['recvs_confirm_finish_receiving'] = 'Are you sure you want to submit this receiving? This cannot be undone.';
 $lang['recvs_confirm_cancel_receiving'] = 'Are you sure you want to clear this receiving? All items will cleared.';
-$lang['recvs_find_or_scan_item']='Find/Scan Item';
-$lang['recvs_find_or_scan_item_or_receipt']='Find/Scan Item OR Receipt';
-$lang['recvs_id']='Receiving ID';
+$lang['recvs_find_or_scan_item'] = 'Find/Scan Item';
+$lang['recvs_find_or_scan_item_or_receipt'] = 'Find/Scan Item OR Receipt';
+$lang['recvs_id'] = 'Receiving ID';
 $lang['recvs_item_name'] = 'Item Name';
 $lang['receivings_transaction_failed'] = 'Receivings Transactions Failed';
 ?>
diff --git a/application/language/en/reports_lang.php b/application/language/en/reports_lang.php
index e41d34242..4a228da09 100644
--- a/application/language/en/reports_lang.php
+++ b/application/language/en/reports_lang.php
@@ -28,9 +28,7 @@ $lang['reports_total'] = 'Total';
 $lang['reports_tax'] = 'Tax';
 $lang['reports_profit'] = 'Profit';
 $lang['reports_report_input'] = 'Report Input';
-$lang['reports_discount'] = 'Discount';
 $lang['reports_type'] = 'Type';
-$lang['reports_discount'] = 'A discount greater than ';
 $lang['reports_date_range'] = 'Date Range';
 $lang['reports_today'] = 'Today';
 $lang['reports_yesterday'] = 'Yesterday';
@@ -86,4 +84,5 @@ $lang['reports_detailed_receivings_report'] = 'Detailed Receivings Report';
 $lang['reports_sale_type'] = 'Sale Type';
 $lang['reports_all'] = 'All';
 $lang['reports_returns'] = 'Returns';
+$lang['reports_discount'] = 'Discounts';
 ?>
diff --git a/application/language/en/sales_lang.php b/application/language/en/sales_lang.php
index dc39c937f..cdb53f9a8 100644
--- a/application/language/en/sales_lang.php
+++ b/application/language/en/sales_lang.php
@@ -1,45 +1,41 @@
 <?php
-$lang['sales_giftcard_number']='Gift Card Number';
-$lang['sales_giftcard']='Gift Card';
-$lang['sales_register']='Sales Register';
-$lang['sales_mode']='Register Mode';
+$lang['sales_giftcard_number'] = 'Gift Card Number';
+$lang['sales_giftcard'] = 'Gift Card';
+$lang['sales_register'] = 'Sales Register';
+$lang['sales_mode'] = 'Register Mode';
 $lang['sales_new_item'] = 'New Item';
 $lang['sales_item_name'] = 'Item Name';
 $lang['sales_item_number'] = 'Item #';
 $lang['sales_new_customer'] = 'New Customer';
 $lang['sales_customer'] = 'Customer';
-$lang['sales_no_items_in_cart']='There are no items in the cart';
-$lang['sales_total']='Total';
-$lang['sales_tax_percent']='Tax %';
-$lang['sales_price']='Price';
-$lang['sales_quantity']='Qty.';
-$lang['sales_discount']='Disc %';
-$lang['sales_discount_short']='%';
-$lang["sales_discount_included"]='% korting inbegrepen';
-$lang['sales_sale_time']='Tijdstip';
-$lang['sales_edit']='Edit';
-$lang['sales_sale_time']='Time';
-$lang['sales_payment']='Payment Type';
-$lang['sales_edit_item']='Edit Item';
-$lang['sales_find_or_scan_item']='Find/Scan Item';
-$lang['sales_find_or_scan_item_or_receipt']='Find/Scan Item OR Receipt';
-$lang['sales_select_customer']='Select Customer (Optional)';
-$lang['sales_start_typing_item_name']='Start Typing item\'s name or scan barcode...';
-$lang['sales_start_typing_customer_name']='Start Typing customer\'s name...';
-$lang['sales_sub_total']='Sub Total';
-$lang['sales_tax']='Tax';
-$lang['sales_comment']='Comment';
-$lang['sales_unable_to_add_item']='Unable to add item to sale';
-$lang['sales_sale_for_customer']='Customer:';
-$lang['sales_remove_customer']='Remove Customer';
-$lang['sales_error_editing_item']='Error editing item';
-$lang['sales_complete_sale']='Complete Sale';
-$lang['sales_cancel_sale']='Cancel Sale';
-$lang['sales_add_payment']='Add Payment';
-$lang['sales_receipt']='Sales Receipt';
-$lang['sales_id']='Sale ID';
-$lang['sales_sale']='Sale';
-$lang['sales_return']='Return';
+$lang['sales_no_items_in_cart'] = 'There are no items in the cart';
+$lang['sales_total'] = 'Total';
+$lang['sales_tax_percent'] = 'Tax %';
+$lang['sales_price'] = 'Price';
+$lang['sales_quantity'] = 'Qty.';
+$lang['sales_discount'] = 'Disc %';
+$lang['sales_edit'] = 'Edit';
+$lang['sales_payment'] = 'Payment Type';
+$lang['sales_edit_item'] = 'Edit Item';
+$lang['sales_find_or_scan_item'] = 'Find/Scan Item';
+$lang['sales_find_or_scan_item_or_receipt'] = 'Find/Scan Item OR Receipt';
+$lang['sales_select_customer'] = 'Select Customer (Optional)';
+$lang['sales_start_typing_item_name'] = 'Start Typing item\'s name or scan barcode...';
+$lang['sales_start_typing_customer_name'] = 'Start Typing customer\'s name...';
+$lang['sales_sub_total'] = 'Sub Total';
+$lang['sales_tax'] = 'Tax';
+$lang['sales_comment'] = 'Comment';
+$lang['sales_unable_to_add_item'] = 'Unable to add item to sale';
+$lang['sales_sale_for_customer'] = 'Customer:';
+$lang['sales_remove_customer'] = 'Remove Customer';
+$lang['sales_error_editing_item'] = 'Error editing item';
+$lang['sales_complete_sale'] = 'Complete Sale';
+$lang['sales_cancel_sale'] = 'Cancel Sale';
+$lang['sales_add_payment'] = 'Add Payment';
+$lang['sales_receipt'] = 'Sales Receipt';
+$lang['sales_id'] = 'Sale ID';
+$lang['sales_sale'] = 'Sale';
+$lang['sales_return'] = 'Return';
 $lang['sales_confirm_finish_sale'] = 'Are you sure you want to submit this sale? This cannot be undone.';
 $lang['sales_confirm_cancel_sale'] = 'Are you sure you want to clear this sale? All items will cleared.';
 $lang['sales_cash'] = 'Cash';
@@ -74,10 +70,14 @@ $lang['sales_confirm_suspend_sale'] = 'Are you sure you want to suspend this sal
 $lang['sales_suspended_sales'] = 'Suspended Sales';
 $lang['sales_suspended_sale_id'] = 'Suspended Sale ID';
 $lang['sales_date'] = 'Date';
-$lang['sales_customer'] = 'Customer';
 $lang['sales_comments'] = 'Comments';
 $lang['sales_unsuspend_and_delete'] = 'Unsuspend and Delete';
 $lang['sales_unsuspend'] = 'Unsuspend';
 $lang['sales_successfully_suspended_sale'] = 'Your sale has been successfully suspended';
 $lang['sales_email_receipt'] = 'E-Mail Receipt';
+$lang['sales_discount_short']='%';
+$lang["sales_discount_included"]='% Discount';
+$lang['sales_sale_time']='Time';
+$lang['sales_payments_total'] = 'Payments Total';
+$lang['sales_amount_due'] = 'Amount Due';
 ?>
\ No newline at end of file
diff --git a/application/language/en/suppliers_lang.php b/application/language/en/suppliers_lang.php
index 97191a352..8f90785d4 100644
--- a/application/language/en/suppliers_lang.php
+++ b/application/language/en/suppliers_lang.php
@@ -1,17 +1,17 @@
 <?php
-$lang['suppliers_new']='New Supplier';
-$lang['suppliers_supplier']='Supplier';
-$lang['suppliers_update']='Update Supplier';
-$lang['suppliers_confirm_delete']='Are you sure you want to delete the selected suppliers?';
-$lang['suppliers_none_selected']='You have not selected any suppliers to delete';
+$lang['suppliers_new'] = 'New Supplier';
+$lang['suppliers_supplier'] = 'Supplier';
+$lang['suppliers_update'] = 'Update Supplier';
+$lang['suppliers_confirm_delete'] = 'Are you sure you want to delete the selected suppliers?';
+$lang['suppliers_none_selected'] = 'You have not selected any suppliers to delete';
 $lang['suppliers_error_adding_updating'] = 'Error adding/updating supplier';
-$lang['suppliers_successful_adding']='You have successfully added supplier';
-$lang['suppliers_successful_updating']='You have successfully updated supplier';
-$lang['suppliers_successful_deleted']='You have successfully deleted';
-$lang['suppliers_one_or_multiple']='supplier(s)';
-$lang['suppliers_cannot_be_deleted']='Could not deleted selected suppliers, one or more of the selected suppliers has sales.';
-$lang['suppliers_basic_information']='Supplier Information';
-$lang['suppliers_account_number']='Account #';
-$lang['suppliers_company_name']='Company Name';
+$lang['suppliers_successful_adding'] = 'You have successfully added supplier';
+$lang['suppliers_successful_updating'] = 'You have successfully updated supplier';
+$lang['suppliers_successful_deleted'] = 'You have successfully deleted';
+$lang['suppliers_one_or_multiple'] = 'supplier(s)';
+$lang['suppliers_cannot_be_deleted'] = 'Could not deleted selected suppliers, one or more of the selected suppliers has sales.';
+$lang['suppliers_basic_information'] = 'Supplier Information';
+$lang['suppliers_account_number'] = 'Account #';
+$lang['suppliers_company_name'] = 'Company Name';
 $lang['suppliers_company_name_required'] = 'Company Name is a required field';
 ?>
diff --git a/application/language/english/common_lang.php b/application/language/english/common_lang.php
deleted file mode 100644
index 5b430fd63..000000000
--- a/application/language/english/common_lang.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-$lang['common_common'] = 'common';
-$lang['common_submit'] = 'Submit';
-$lang['common_or'] = 'OR';
-$lang['common_powered_by'] = 'Powered by';
-$lang['common_welcome'] = 'Welcome';
-$lang['common_logout'] = 'Logout';
-$lang['common_list_of'] = 'List of';
-$lang['common_first_name'] = 'First Name';
-$lang['common_last_name'] = 'Last Name';
-$lang['common_email'] = 'E-Mail';
-$lang['common_phone_number'] = 'Phone Number';
-$lang['common_address_1'] = 'Address 1';
-$lang['common_address_2'] = 'Address 2';
-$lang['common_city'] = 'City';
-$lang['common_state'] = 'State';
-$lang['common_zip'] = 'Zip';
-$lang['common_country'] = 'Country';
-$lang['common_comments'] = 'Comments';
-$lang['common_edit'] = 'edit';
-$lang['common_search'] = 'Search';
-$lang['common_delete'] = 'Delete';
-$lang['common_remove'] = 'Remove';
-$lang['common_view_recent_sales'] = 'View Recent Sales';
-$lang['common_you_are_using_ospos'] = 'You are using Open Source Point Of Sale Version';
-$lang['common_please_visit_my'] = 'Please visit my';
-$lang['common_website'] = 'website';
-$lang['common_fields_required_message'] = 'Fields in red are required';
-$lang['common_learn_about_project'] = 'to learn the lastest information about the project';
-$lang['common_searched_for'] = 'Searched for';
-$lang['common_first_name_required'] = 'The first name is a required field.';
-$lang['common_last_name_required'] = 'The last name is a required field';
-$lang['common_email_invalid_format'] = 'The e-mail address is not in the proper format';
-$lang['common_confirm_search'] = 'You have selected one or more rows, these will no longer be selected after your search. Are you sure you want to submit this search?';
-$lang['common_no_persons_to_display'] = 'There are no people to display';
-$lang['common_return_policy'] = 'Return Policy';
-$lang['common_price'] = 'Price';
-$lang['common_welcome_message']= 'Welcome to Open Source Point Of Sale, click a module below to get started!';
-$lang['common_inv'] = 'inv';
-$lang['common_det'] = 'details';
-?>
\ No newline at end of file
diff --git a/application/language/english/config_lang.php b/application/language/english/config_lang.php
deleted file mode 100644
index b0c3f02f9..000000000
--- a/application/language/english/config_lang.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-$lang['config_info'] = 'Store Configuration Information';
-$lang['config_company'] = 'Company Name';
-$lang['config_address'] = 'Company Address';
-$lang['config_phone'] = 'Company Phone';
-$lang['config_website'] = 'Website';
-$lang['config_fax'] = 'Fax';
-$lang['config_default_tax_rate'] = 'Default Tax Rate %';
-$lang['config_default_tax_rate_1'] = 'Tax 1 Rate';
-$lang['config_default_tax_rate_2'] = 'Tax 2 Rate';
-$lang['config_company_required'] = 'Company name is a required field';
-$lang['config_address_required'] = 'Company address is a required field';
-$lang['config_phone_required'] = 'Company phone is a required field';
-$lang['config_default_tax_rate_required'] = 'The default tax rate is a required field';
-$lang['config_default_tax_rate_number'] = 'The default tax rate must be a number';
-$lang['config_company_website_url'] = 'Company website is not a valid URL (http://...)';
-$lang['config_saved_successfully'] = 'Configuration saved successfully';
-$lang['config_saved_unsuccessfully'] = 'Configuration saved unsuccessfully';
-$lang['config_return_policy_required'] = 'Return policy is a required field';
-$lang['config_print_after_sale'] = 'Print receipt after sale';
-$lang['config_language'] = 'Language';
-$lang['config_timezone'] = 'Timezone';
-$lang['config_currency_symbol'] = 'Currency Symbol';
-$lang['config_currency_side'] = 'Right side'; //GARRISON ADDED 4/20/2013
-$lang['config_custom1'] = 'Custom Field 1'; //GARRISON ADDED 4/21/2013
-$lang['config_custom2'] = 'Custom Field 2'; //GARRISON ADDED 4/21/2013
-$lang['config_custom3'] = 'Custom Field 3'; //GARRISON ADDED 4/21/2013
-$lang['config_custom4'] = 'Custom Field 4'; //GARRISON ADDED 4/21/2013
-$lang['config_custom5'] = 'Custom Field 5'; //GARRISON ADDED 4/21/2013
-$lang['config_custom6'] = 'Custom Field 6'; //GARRISON ADDED 4/21/2013
-$lang['config_custom7'] = 'Custom Field 7'; //GARRISON ADDED 4/21/2013
-$lang['config_custom8'] = 'Custom Field 8'; //GARRISON ADDED 4/21/2013
-$lang['config_custom9'] = 'Custom Field 9'; //GARRISON ADDED 4/21/2013
-$lang['config_custom10'] = 'Custom Field 10'; //GARRISON ADDED 4/21/2013
-$lang['config_tax_included'] = 'Tax Included';
-?>
\ No newline at end of file
diff --git a/application/language/english/customers_lang.php b/application/language/english/customers_lang.php
deleted file mode 100644
index 3f8804144..000000000
--- a/application/language/english/customers_lang.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-$lang['customers_new'] = 'New Customer';
-$lang['customers_customer'] = 'Customer';
-$lang['customers_update'] = 'Update Customer';
-$lang['customers_confirm_delete'] = 'Are you sure you want to delete the selected customers?';
-$lang['customers_none_selected'] = 'You have not selected any customers to delete';
-$lang['customers_error_adding_updating'] = 'Error adding/updating customer';
-$lang['customers_successful_adding'] = 'You have successfully added customer';
-$lang['customers_successful_updating'] = 'You have successfully updated customer';
-$lang['customers_successful_deleted'] = 'You have successfully deleted';
-$lang['customers_one_or_multiple'] = 'customer(s)';
-$lang['customers_cannot_be_deleted'] = 'Could not deleted selected customers, one or more of the selected customers has sales.';
-$lang['customers_basic_information'] = 'Customer Information';
-$lang['customers_account_number'] = 'Account #';
-$lang['customers_taxable'] = 'Taxable';
-?>
diff --git a/application/language/english/employees_lang.php b/application/language/english/employees_lang.php
deleted file mode 100644
index 5f77c5a85..000000000
--- a/application/language/english/employees_lang.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-$lang['employees_employee'] = 'Employee';
-$lang['employees_new'] = 'New Employee';
-$lang['employees_update'] = 'Update Employee';
-$lang['employees_confirm_delete'] = 'Are you sure you want to delete the selected employees?';
-$lang['employees_none_selected'] = 'You have not selected any employees to delete';
-$lang['employees_error_adding_updating'] = 'Error adding/updating employee';
-$lang['employees_successful_adding'] = 'You have successfully added employee';
-$lang['employees_successful_updating'] = 'You have successfully updated employee';
-$lang['employees_successful_deleted'] = 'You have successfully deleted';
-$lang['employees_one_or_multiple'] = 'employee(s)';
-$lang['employees_cannot_be_deleted'] = 'Could not deleted selected employees, one or more of the employees has processed sales or you are trying to delete yourself :)';
-$lang['employees_username'] = 'Username';
-$lang['employees_password'] = 'Password';
-$lang['employees_repeat_password'] = 'Password Again';
-$lang['employees_username_required'] = 'Username is a required field';
-$lang['employees_username_minlength'] = 'The username must be at least 5 characters';
-$lang['employees_password_required'] = 'Password is required';
-$lang['employees_password_minlength'] = 'Passwords must be at least 8 characters';
-$lang['employees_password_must_match'] = 'Passwords do not match';
-$lang['employees_basic_information'] = 'Employee Basic Information';
-$lang['employees_login_info'] = 'Employee Login Info';
-$lang['employees_permission_info'] = 'Employee Permissions and Access';
-$lang['employees_permission_desc'] = 'Check the boxes below to grant access to modules';
-$lang['employees_error_updating_demo_admin'] = 'You can not change the demo admin user';
-$lang['employees_error_deleting_demo_admin'] = 'You can not delete the demo admin user';
-?>
diff --git a/application/language/english/error_lang.php b/application/language/english/error_lang.php
deleted file mode 100644
index c7c178e9f..000000000
--- a/application/language/english/error_lang.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$lang['error_no_permission_module'] = 'You do not have permission to access the module named';
-$lang['error_unknown'] = 'unknown';
-?>
\ No newline at end of file
diff --git a/application/language/english/giftcards_lang.php b/application/language/english/giftcards_lang.php
deleted file mode 100644
index 5bb1766be..000000000
--- a/application/language/english/giftcards_lang.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-$lang['giftcards_giftcard_number'] = 'Giftcard Number';
-$lang['giftcards_card_value'] = 'Value';
-$lang['giftcards_basic_information'] = 'Giftcard Information';
-$lang['giftcards_number_required'] = 'Giftcard Number is a required field';
-$lang['giftcards_value_required'] = 'Giftcard Value is a required field';
-$lang['giftcards_number'] = 'Giftcard Number must be a number';
-$lang['giftcards_value'] = 'Giftcard Value must be a number';
-$lang['giftcards_person_id'] = 'Customer';
-$lang['giftcards_retrive_giftcard_info'] = 'Retrieve Giftcard Info';
-$lang['giftcards_description'] = 'Description';
-$lang['giftcards_amazon'] = 'Amazon';
-$lang['giftcards_upc_database'] = 'UPC Database';
-$lang['giftcards_cannot_find_giftcard'] = 'Cannot find any information about giftcard';
-$lang['giftcards_info_provided_by'] = 'Info provided by';
-$lang['giftcards_number_information'] = 'Giftcard Number';
-$lang['giftcards_new'] = 'New Giftcard';
-$lang['giftcards_update'] = 'Update Giftcard';
-$lang['giftcards_giftcard'] = 'Giftcard';
-$lang['giftcards_edit_multiple_giftcards'] = 'Editing Multiple Giftcards';
-$lang['giftcards_category'] = 'Category';
-$lang['giftcards_cost_price'] = 'Cost Price';
-$lang['giftcards_unit_price'] = 'Unit Price';
-$lang['giftcards_tax_1'] = 'Tax 1';
-$lang['giftcards_tax_2'] = 'Tax 2';
-$lang['giftcards_sales_tax_1'] = 'Sales Tax';
-$lang['giftcards_sales_tax_2'] = 'Sales Tax 2';
-$lang['giftcards_tax_percent'] = 'Tax Percent';
-$lang['giftcards_tax_percents'] = 'Tax Percent(s)';
-$lang['giftcards_reorder_level'] = 'Reorder Level';
-$lang['giftcards_quantity'] = 'Quantity';
-$lang['giftcards_no_giftcards_to_display'] = 'No Giftcards to display';
-$lang['giftcards_bulk_edit'] = 'Bulk Edit';
-$lang['giftcards_confirm_delete'] = 'Are you sure you want to delete the selected giftcards?';
-$lang['giftcards_none_selected'] = 'You have not selected any giftcards to edit';
-$lang['giftcards_confirm_bulk_edit'] = 'Are you sure you want to edit all the giftcards selected?';
-$lang['giftcards_successful_bulk_edit'] = 'You have successfully updated the selected giftcards';
-$lang['giftcards_error_updating_multiple'] = 'Error updating giftcards';
-$lang['giftcards_edit_fields_you_want_to_update'] = 'Edit the fields you want to edit for ALL selected giftcards';
-$lang['giftcards_error_adding_updating'] = 'Error adding/updating giftcard';
-$lang['giftcards_successful_adding'] = 'You have successfully added giftcard';
-$lang['giftcards_successful_updating'] = 'You have successfully updated giftcard';
-$lang['giftcards_successful_deleted'] = 'You have successfully deleted';
-$lang['giftcards_one_or_multiple'] = 'giftcard(s)';
-$lang['giftcards_cannot_be_deleted'] = 'Could not deleted selected giftcards, one or more of the selected giftcards has sales.';
-$lang['giftcards_none'] = 'None';
-$lang['giftcards_supplier'] = 'Supplier';
-$lang['giftcards_generate_barcodes'] = 'Generate Barcodes';
-$lang['giftcards_must_select_giftcard_for_barcode'] = 'You must select at least 1 giftcard to generate barcodes';
-$lang['giftcards_excel_import_failed'] = 'Excel import failed';
-$lang['giftcards_allow_alt_description'] = 'Allow Alt Description';
-$lang['giftcards_is_serialized'] = 'Giftcard has Serial Number';
-$lang['giftcards_low_inventory_giftcards'] = 'Low Inventory Giftcards';
-$lang['giftcards_serialized_giftcards'] = 'Serialized Giftcards';
-$lang['giftcards_no_description_giftcards'] = 'No Description Giftcards';
-$lang['giftcards_inventory_comments'] = 'Comments';
-$lang['giftcards_count'] = 'Update Inventory';
-$lang['giftcards_details_count'] = 'Inventory Count Details';
-$lang['giftcards_add_minus'] = 'Inventory to add/subtract';
-$lang['giftcards_current_quantity'] = 'Current Quantity';
-$lang['giftcards_quantity_required'] = 'Quantity is a required field. Please Close ( X ) to cancel';
-$lang['giftcards_do_nothing'] = 'Do Nothing';
-$lang['giftcards_change_all_to_serialized'] = 'Change All To Serialized';
-$lang['giftcards_change_all_to_unserialized'] = 'Change All To Unserialized';
-$lang['giftcards_change_all_to_allow_alt_desc'] = 'Allow Alt Desc For All';
-$lang['giftcards_change_all_to_not_allow_allow_desc'] = 'Not Allow Alt Desc For All';
-$lang['giftcards_use_inventory_menu'] = 'Use Inv. Menu';
-$lang['giftcards_manually_editing_of_quantity'] = 'Manual Edit of Quantity';
-?>
\ No newline at end of file
diff --git a/application/language/english/item_kits_lang.php b/application/language/english/item_kits_lang.php
deleted file mode 100644
index 601fae62d..000000000
--- a/application/language/english/item_kits_lang.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-$lang['item_kits_name'] = 'Item Kit Name';
-$lang['item_kits_description'] = 'Item Kit Description';
-$lang['item_kits_no_item_kits_to_display'] = 'No item kits to display';
-$lang['item_kits_update'] = 'Update Item Kit';
-$lang['item_kits_new'] = 'New Item Kit';
-$lang['item_kits_none_selected'] = "You have not selected any item kits";
-$lang['item_kits_info'] = 'Item Kit Info';
-$lang['item_kits_successful_adding'] = 'You have successfully added Item Kit';
-$lang['item_kits_successful_updating'] = 'You have successfully updated Item Kit';
-$lang['item_kits_error_adding_updating'] = 'Error adding/updating Item Kit';
-$lang['item_kits_successful_deleted'] = 'You have successfully deleted';
-$lang['item_kits_confirm_delete'] = 'Are you sure you want to delete the selected item kits?';
-$lang['item_kits_one_or_multiple'] = 'Item Kit(s)';
-$lang['item_kits_cannot_be_deleted'] = 'Could not delete item kit(s)';
-$lang['item_kits_add_item'] = 'Add Item';
-$lang['item_kits_items'] = 'Items';
-$lang['item_kits_item'] = 'Item';
-$lang['item_kits_quantity'] = 'Quantity';
-?>
diff --git a/application/language/english/items_lang.php b/application/language/english/items_lang.php
deleted file mode 100644
index 2f5b7b03c..000000000
--- a/application/language/english/items_lang.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-$lang['items_item_number'] = 'UPC/EAN/ISBN';
-$lang['items_retrive_item_info'] = 'Retrive Item Info';
-$lang['items_description'] = 'Description';
-$lang['items_amazon'] = 'Amazon';
-$lang['items_upc_database'] = 'UPC Database';
-$lang['items_cannot_find_item'] = 'Cannot find any information about item';
-$lang['items_info_provided_by'] = 'Info provided by';
-$lang['items_basic_information'] = 'Item Information';
-$lang['items_number_information'] = 'Item Number';
-$lang['items_new'] = 'New Item';
-$lang['items_update'] = 'Update Item';
-$lang['items_item'] = 'Item';
-$lang['items_edit_multiple_items'] = 'Editing Multiple Items';
-$lang['items_name'] = 'Item Name';
-$lang['items_category'] = 'Category';
-$lang['items_cost_price'] = 'Wholesale Price';//GARRISON ADDED 4/21/2013
-$lang['items_unit_price'] = 'Retail Price';//GARRISON ADDED 4/21/2013
-$lang['items_tax_1'] = 'Tax 1';
-$lang['items_tax_2'] = 'Tax 2';
-$lang['items_sales_tax_1'] = 'Sales Tax';
-$lang['items_sales_tax_2'] = 'Sales Tax 2';
-$lang['items_tax_percent'] = 'Tax Percent';
-$lang['items_tax_percents'] = 'Tax Percent(s)';
-$lang['items_reorder_level'] = 'Reorder Level';
-$lang['items_quantity'] = 'Quantity';
-$lang['items_reorder_level'] = 'Reorder Level';
-$lang['items_no_items_to_display'] = 'No Items to display';
-$lang['items_bulk_edit'] = 'Bulk Edit';
-$lang['items_confirm_delete'] = 'Are you sure you want to delete the selected items?';
-$lang['items_none_selected'] = 'You have not selected any items to edit';
-$lang['items_confirm_bulk_edit'] = 'Are you sure you want to edit all the items selected?';
-$lang['items_successful_bulk_edit'] = 'You have successfully updated the selected items';
-$lang['items_error_updating_multiple'] = 'Error updating items';
-$lang['items_edit_fields_you_want_to_update'] = 'Edit the fields you want to edit for ALL selected items';
-$lang['items_error_adding_updating'] = 'Error adding/updating item';
-$lang['items_successful_adding'] = 'You have successfully added item';
-$lang['items_successful_updating'] = 'You have successfully updated item';
-$lang['items_successful_deleted'] = 'You have successfully deleted';
-$lang['items_one_or_multiple'] = 'item(s)';
-$lang['items_cannot_be_deleted'] = 'Could not deleted selected items, one or more of the selected items has sales.';
-$lang['items_name_required'] = 'Item Name is a required field';
-$lang['items_category_required'] = 'Category is a required field';
-$lang['items_buy_price_required'] = 'Purchase price is a required field';		//GARRISON UPDATED 6/3/2013
-$lang['items_unit_price_required'] = 'Retail Price is a required field';		//GARRISON UPDATED 6/3/2013
-$lang['items_cost_price_required'] = 'Wholesale Price is a required field';	//GARRISON UPDATED 6/3/2013
-$lang['items_tax_percent_required'] = 'Tax Percent is a required field';
-$lang['items_quantity_required'] = 'Quantity is a required field';
-$lang['items_reorder_level_required'] = 'Reorder level is a required field';
-$lang['items_unit_price_number'] = 'Unit price must be a number';
-$lang['items_cost_price_number'] = 'Cost price must be a number';
-$lang['items_quantity_number'] = 'Quantity must be a number';
-$lang['items_reorder_level_number'] = 'Reorder level must be a number';
-$lang['items_none'] = 'None';
-$lang['items_supplier'] = 'Supplier';
-$lang['items_generate_barcodes'] = 'Generate Barcodes';
-$lang['items_must_select_item_for_barcode'] = 'You must select at least 1 item to generate barcodes';
-$lang['items_excel_import_failed'] = 'Excel import failed';
-$lang['items_allow_alt_description'] = 'Allow Alt Description';
-$lang['items_is_serialized'] = 'Item has Serial Number';
-$lang['items_low_inventory_items'] = 'Low Inventory Items';
-$lang['items_serialized_items'] = 'Serialized Items';
-$lang['items_no_description_items'] = 'No Description Items';
-$lang['items_search_custom_items'] = 'Search Custom Fields';//GARRISON ADDED
-$lang['items_inventory_comments'] = 'Comments';
-$lang['items_count'] = 'Update Inventory';
-$lang['items_details_count'] = 'Inventory Count Details';
-$lang['items_add_minus'] = 'Inventory to add/subtract';
-$lang['items_current_quantity'] = 'Current Quantity';
-$lang['items_quantity_required'] = 'Quantity is a required field. Please Close ( X ) to cancel';
-$lang['items_do_nothing'] = 'Do Nothing';
-$lang['items_change_all_to_serialized'] = 'Change All To Serialized';
-$lang['items_change_all_to_unserialized'] = 'Change All To Unserialized';
-$lang['items_change_all_to_allow_alt_desc'] = ' Allow Alt Desc For All';
-$lang['items_change_all_to_not_allow_allow_desc'] = 'Not Allow Alt Desc For All';
-$lang['items_use_inventory_menu'] = 'Use Inv. Menu';
-$lang['items_manually_editing_of_quantity'] = 'Manual Edit of Quantity';
-$lang['items_inventory'] = 'Inventory';
-$lang['items_location'] = 'Location';
-$lang['items_is_deleted'] = 'Deleted';// Parq 131215
-?>
\ No newline at end of file
diff --git a/application/language/english/login_lang.php b/application/language/english/login_lang.php
deleted file mode 100644
index db5f2753e..000000000
--- a/application/language/english/login_lang.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$lang['login_login'] = 'Login';
-$lang['login_username'] = 'Username';
-$lang['login_password'] = 'Password';
-$lang['login_go'] = 'Go';
-$lang['login_invalid_username_and_password'] = 'Invalid username/password';
-$lang['login_welcome_message'] = 'Welcome to the Open Source Point of Sale System. To continue, please login using your username and password below.';
-?>
diff --git a/application/language/english/module_lang.php b/application/language/english/module_lang.php
deleted file mode 100644
index d45a4b6b4..000000000
--- a/application/language/english/module_lang.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-$lang['module_home'] = 'Home';
-
-$lang['module_customers'] = 'Customers';
-$lang['module_customers_desc'] = 'Add, Update, Delete, and Search customers';
-
-$lang['module_suppliers'] = 'Suppliers';
-$lang['module_suppliers_desc'] = 'Add, Update, Delete, and Search suppliers';
-
-$lang['module_employees'] = 'Employees';
-$lang['module_employees_desc'] = 'Add, Update, Delete, and Search employees';
-
-$lang['module_sales'] = 'Sales';
-$lang['module_sales_desc'] = 'Process sales and returns';
-
-$lang['module_reports'] = 'Reports';
-$lang['module_reports_desc'] = 'View and generate reports';
-
-$lang['module_items'] = 'Items';
-$lang['module_items_desc'] = 'Add, Update, Delete, and Search items';
-
-$lang['module_config'] = 'Store Config';
-$lang['module_config_desc'] = 'Change the store\'s configuration';
-
-$lang['module_receivings'] = 'Receivings';
-$lang['module_receivings_desc'] = 'Process Purchase orders';
-
-$lang['module_giftcards'] = 'Gift Cards';
-$lang['module_giftcards_desc'] = 'Add, Update, Delete and Search gift cards';
-
-$lang['module_item_kits'] = 'Item Kits';
-$lang['module_item_kits_desc'] = 'Add, Update, Delete and Search Item Kits';
-
-?>
diff --git a/application/language/english/receivings_lang.php b/application/language/english/receivings_lang.php
deleted file mode 100644
index efeb84355..000000000
--- a/application/language/english/receivings_lang.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-$lang['recvs_register'] = 'Items Receiving';
-$lang['recvs_mode'] = 'Receiving Mode';
-$lang['recvs_receiving'] = 'Receive';
-$lang['recvs_return'] = 'Return';
-$lang['recvs_total'] = 'Total';
-$lang['recvs_cost'] = 'Cost';
-$lang['recvs_quantity'] = 'Qty.';
-$lang['recvs_discount'] = 'Disc %';
-$lang['recvs_edit'] = 'Edit';
-$lang['recvs_new_supplier'] = 'New Supplier';
-$lang['recvs_supplier'] = 'Supplier';
-$lang['recvs_select_supplier'] = 'Select Supplier (Optional)';
-$lang['recvs_start_typing_supplier_name'] = 'Start Typing supplier\'s name...';
-$lang['recvs_unable_to_add_item'] = 'Unable to add item to receiving';
-$lang['recvs_error_editing_item'] = 'Error editing item';
-$lang['recvs_receipt'] = 'Receivings Receipt';
-$lang['recvs_complete_receiving'] = 'Finish';
-$lang['recvs_confirm_finish_receiving'] = 'Are you sure you want to submit this receiving? This cannot be undone.';
-$lang['recvs_confirm_cancel_receiving'] = 'Are you sure you want to clear this receiving? All items will cleared.';
-$lang['recvs_find_or_scan_item'] = 'Find/Scan Item';
-$lang['recvs_find_or_scan_item_or_receipt'] = 'Find/Scan Item OR Receipt';
-$lang['recvs_id'] = 'Receiving ID';
-$lang['recvs_item_name'] = 'Item Name';
-$lang['receivings_transaction_failed'] = 'Receivings Transactions Failed';
-?>
diff --git a/application/language/english/reports_lang.php b/application/language/english/reports_lang.php
deleted file mode 100644
index b37841815..000000000
--- a/application/language/english/reports_lang.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-$lang['reports_reports'] = 'Reports';
-$lang['reports_report'] = 'Report';
-$lang['reports_welcome_message'] = 'Welcome to the reports panel. Please select a report to view.';
-$lang['reports_sales_summary_report'] = 'Sales Summary Report';
-$lang['reports_categories_summary_report'] = 'Categories Summary Report';
-$lang['reports_customers_summary_report'] = 'Customers Summary Report';
-$lang['reports_suppliers_summary_report'] = 'Suppliers Summary Report';
-$lang['reports_items_summary_report'] = 'Items Summary Report';
-$lang['reports_employees_summary_report'] = 'Employees Summary Report';
-$lang['reports_taxes_summary_report'] = 'Taxes Summary Report';
-$lang['reports_date'] = 'Date';
-$lang['reports_name'] = 'Name';
-$lang['reports_quantity_purchased'] = 'Quantity Purchased';
-$lang['reports_sale_id'] = 'Sale ID';
-$lang['reports_items_purchased'] = 'Items Purchased';
-$lang['reports_sold_by'] = 'Sold By';
-$lang['reports_sold_to'] = 'Sold To';
-$lang['reports_category'] = 'Category';
-$lang['reports_customer'] = 'Customer';
-$lang['reports_employee'] = 'Employee';
-$lang['reports_item'] = 'Item';
-$lang['reports_items'] = 'Items';
-$lang['reports_supplier'] = 'Supplier';
-$lang['reports_employees'] = 'Employees';
-$lang['reports_subtotal'] = 'Subtotal';
-$lang['reports_total'] = 'Total';
-$lang['reports_tax'] = 'Tax';
-$lang['reports_profit'] = 'Profit';
-$lang['reports_report_input'] = 'Report Input';
-$lang['reports_type'] = 'Type';
-$lang['reports_date_range'] = 'Date Range';
-$lang['reports_today'] = 'Today';
-$lang['reports_yesterday'] = 'Yesterday';
-$lang['reports_last_7'] = 'Last 7 Days';
-$lang['reports_this_month'] = 'This Month';
-$lang['reports_last_month'] = 'Last Month';
-$lang['reports_this_year'] = 'This Year';
-$lang['reports_last_year'] = 'Last Year';
-$lang['reports_all_time'] = 'All Time';
-$lang['reports_detailed_sales_report'] = 'Detailed Sales Report';
-$lang['reports_comments'] = 'Comments';
-$lang['reports_discount'] = 'Discount';
-$lang['reports_payment_type'] = 'Payment Type';
-$lang['reports_sales'] = 'Sales';
-$lang['reports_categories'] = 'Categories';
-$lang['reports_customers'] = 'Customers';
-$lang['reports_suppliers'] = 'Suppliers';
-$lang['reports_items'] = 'Items';
-$lang['reports_employees'] = 'Employees';
-$lang['reports_taxes'] = 'Taxes';
-$lang['reports_customer'] = 'Customer';
-$lang['reports_employee'] = 'Employee';
-$lang['reports_tax_percent'] = 'Tax Percent';
-$lang['reports_quantity_purchased'] = 'Quantity Purchased';
-$lang['reports_serial_number'] = 'Serial #';
-$lang['reports_description'] = 'Description';
-$lang['reports_date'] = 'Date';
-$lang['reports_sales_amount'] = 'Sales amount';
-$lang['reports_revenue'] = 'Revenue';
-$lang['reports_discounts'] = 'Discounts';
-$lang['reports_discounts_summary_report'] = 'Discounts Summary Report';
-$lang['reports_discount_percent'] = 'Discount Percent';
-$lang['reports_count'] = 'Count';
-$lang['reports_summary_reports'] = 'Summary Reports';
-$lang['reports_graphical_reports'] = 'Graphical Reports';
-$lang['reports_detailed_reports'] = 'Detailed Reports';
-$lang['reports_inventory_reports'] = 'Inventory Reports';
-$lang['reports_low_inventory'] = 'Low Inventory';
-$lang['reports_inventory_summary'] = ' Inventory Summary';
-$lang['reports_item_number'] = 'Item Number';
-$lang['reports_reorder_level'] = 'Reorder Level';
-$lang['reports_low_inventory_report'] = 'Low Inventory Report';
-$lang['reports_item_name'] = 'Item Name';
-$lang['reports_inventory_summary_report'] = 'Inventory Summary Report';
-$lang['reports_payment_type'] = 'Payment Type';
-$lang['reports_payments_summary_report'] = 'Payments Summary Report';
-$lang['reports_payments'] = 'Payments';
-$lang['reports_receivings'] = 'Receivings';
-$lang['reports_received_by'] = 'Received By';
-$lang['reports_supplied_by'] = 'Supplied by';
-$lang['reports_items_received'] = 'Items Received';
-$lang['reports_detailed_receivings_report'] = 'Detailed Receivings Report';
-$lang['reports_sale_type'] = 'Sale Type';
-$lang['reports_all'] = 'All';
-$lang['reports_returns'] = 'Returns';
-$lang['reports_discount'] = 'A discount greater than ';
-?>
\ No newline at end of file
diff --git a/application/language/english/sales_lang.php b/application/language/english/sales_lang.php
deleted file mode 100644
index ee82b2be7..000000000
--- a/application/language/english/sales_lang.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-$lang['sales_giftcard_number'] = 'Gift Card Number';
-$lang['sales_giftcard'] = 'Gift Card';
-$lang['sales_register'] = 'Sales Register';
-$lang['sales_mode'] = 'Register Mode';
-$lang['sales_new_item'] = 'New Item';
-$lang['sales_item_name'] = 'Item Name';
-$lang['sales_item_number'] = 'Item #';
-$lang['sales_new_customer'] = 'New Customer';
-$lang['sales_customer'] = 'Customer';
-$lang['sales_no_items_in_cart'] = 'There are no items in the cart';
-$lang['sales_total'] = 'Total';
-$lang['sales_tax_percent'] = 'Tax %';
-$lang['sales_price'] = 'Price';
-$lang['sales_quantity'] = 'Qty.';
-$lang['sales_discount'] = 'Disc %';
-$lang['sales_edit'] = 'Edit';
-$lang['sales_payment'] = 'Payment Type';
-$lang['sales_edit_item'] = 'Edit Item';
-$lang['sales_find_or_scan_item'] = 'Find/Scan Item';
-$lang['sales_find_or_scan_item_or_receipt'] = 'Find/Scan Item OR Receipt';
-$lang['sales_select_customer'] = 'Select Customer (Optional)';
-$lang['sales_start_typing_item_name'] = 'Start Typing item\'s name or scan barcode...';
-$lang['sales_start_typing_customer_name'] = 'Start Typing customer\'s name...';
-$lang['sales_sub_total'] = 'Sub Total';
-$lang['sales_tax'] = 'Tax';
-$lang['sales_comment'] = 'Comment';
-$lang['sales_unable_to_add_item'] = 'Unable to add item to sale';
-$lang['sales_sale_for_customer'] = 'Customer:';
-$lang['sales_remove_customer'] = 'Remove Customer';
-$lang['sales_error_editing_item'] = 'Error editing item';
-$lang['sales_complete_sale'] = 'Complete Sale';
-$lang['sales_cancel_sale'] = 'Cancel Sale';
-$lang['sales_add_payment'] = 'Add Payment';
-$lang['sales_receipt'] = 'Sales Receipt';
-$lang['sales_id'] = 'Sale ID';
-$lang['sales_sale'] = 'Sale';
-$lang['sales_return'] = 'Return';
-$lang['sales_confirm_finish_sale'] = 'Are you sure you want to submit this sale? This cannot be undone.';
-$lang['sales_confirm_cancel_sale'] = 'Are you sure you want to clear this sale? All items will cleared.';
-$lang['sales_cash'] = 'Cash';
-$lang['sales_check'] = 'Check';
-$lang['sales_debit'] = 'Debit Card';
-$lang['sales_credit'] = 'Credit Card';
-$lang['sales_giftcard'] = 'Gift Card';
-$lang['sales_amount_tendered'] = 'Amount Tendered';
-$lang['sales_change_due'] = 'Change Due';
-$lang['sales_payment_not_cover_total'] = 'Payment Amount does not cover Total';
-$lang['sales_transaction_failed'] = 'Sales Transaction Failed';
-$lang['sales_must_enter_numeric'] = 'Must enter numeric value for amount tendered';
-$lang['sales_must_enter_numeric_giftcard'] = 'Must enter numeric value for giftcard number';
-$lang['sales_serial'] = 'Serial';
-$lang['sales_description_abbrv'] = 'Desc';
-$lang['sales_item_out_of_stock'] = 'Item is Out of Stock';
-$lang['sales_item_insufficient_of_stock'] = 'Item is Insufficient of Stock';
-$lang['sales_quantity_less_than_zero'] = 'Warning, Desired Quantity is Insufficient. You can still process the sale, but check your inventory';
-$lang['sales_successfully_updated'] = 'Sale successfully updated';
-$lang['sales_unsuccessfully_updated'] = 'Sale unsuccessfully updated';
-$lang['sales_edit_sale'] = 'Edit Sale';
-$lang['sales_employee'] = 'Employee';
-$lang['sales_successfully_deleted'] = 'Sale successfully deleted';
-$lang['sales_unsuccessfully_deleted'] = 'Sale unsuccessfully deleted';
-$lang['sales_delete_entire_sale'] = 'Delete entire sale';
-$lang['sales_delete_confirmation'] = 'Are you sure you want to delete this sale, this action cannot be undone';
-$lang['sales_delete_successful'] = 'You have successfully deleted a sale';
-$lang['sales_delete_unsuccessful'] = 'You have unsuccessfully deleted a sale';
-$lang['sales_suspend_sale'] = 'Suspend Sale';
-$lang['sales_confirm_suspend_sale'] = 'Are you sure you want to suspend this sale?';
-$lang['sales_suspended_sales'] = 'Suspended Sales';
-$lang['sales_suspended_sale_id'] = 'Suspended Sale ID';
-$lang['sales_date'] = 'Date';
-$lang['sales_comments'] = 'Comments';
-$lang['sales_unsuspend_and_delete'] = 'Unsuspend and Delete';
-$lang['sales_unsuspend'] = 'Unsuspend';
-$lang['sales_successfully_suspended_sale'] = 'Your sale has been successfully suspended';
-$lang['sales_email_receipt'] = 'E-Mail Receipt';
-$lang['sales_discount_short']='%';
-$lang["sales_discount_included"]='% Discount';
-$lang['sales_sale_time']='Time';
-$lang['sales_payments_total'] = 'Payments Total';
-$lang['sales_amount_due'] = 'Amount Due';
-?>
\ No newline at end of file
diff --git a/application/language/english/suppliers_lang.php b/application/language/english/suppliers_lang.php
deleted file mode 100644
index 6745f1e6c..000000000
--- a/application/language/english/suppliers_lang.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-$lang['suppliers_new'] = 'New Supplier';
-$lang['suppliers_supplier'] = 'Supplier';
-$lang['suppliers_update'] = 'Update Supplier';
-$lang['suppliers_confirm_delete'] = 'Are you sure you want to delete the selected suppliers?';
-$lang['suppliers_none_selected'] = 'You have not selected any suppliers to delete';
-$lang['suppliers_error_adding_updating'] = 'Error adding/updating supplier';
-$lang['suppliers_successful_adding'] = 'You have successfully added supplier';
-$lang['suppliers_successful_updating'] = 'You have successfully updated supplier';
-$lang['suppliers_successful_deleted'] = 'You have successfully deleted';
-$lang['suppliers_one_or_multiple'] = 'supplier(s)';
-$lang['suppliers_cannot_be_deleted'] = 'Could not deleted selected suppliers, one or more of the selected suppliers has sales.';
-$lang['suppliers_basic_information'] = 'Supplier Information';
-$lang['suppliers_account_number'] = 'Account #';
-$lang['suppliers_company_name'] = 'Company Name';
-$lang['suppliers_company_name_required'] = 'Company Name is a required field';
-?>
\ No newline at end of file
diff --git a/application/language/nl-BE/common_lang.php b/application/language/nl-BE/common_lang.php
index 47cd11b35..415efc9b6 100755
--- a/application/language/nl-BE/common_lang.php
+++ b/application/language/nl-BE/common_lang.php
@@ -15,7 +15,7 @@ $lang['common_address_2']='Adres 2';
 $lang['common_city']='Stad';
 $lang['common_state']='Provincie';
 $lang['common_zip']='Postcode';
-$lang['common_country']='Country';
+$lang['common_country']='Land';
 $lang['common_comments']='Commentaar';
 $lang['common_edit']='bewerk';
 $lang['common_search']='Zoek';
diff --git a/application/language/nl-BE/customers_lang.php b/application/language/nl-BE/customers_lang.php
index 56d7de000..6277e342b 100755
--- a/application/language/nl-BE/customers_lang.php
+++ b/application/language/nl-BE/customers_lang.php
@@ -6,11 +6,11 @@ $lang['customers_confirm_delete']='Bent u zeker dat u de geselecteerde klanten w
 $lang['customers_none_selected']='U hebt geen klanten geselecteerd';
 $lang['customers_error_adding_updating'] = 'Fout bij het toevoegen/bewerken van een klant';
 $lang['customers_successful_adding']='Klant succesvol aangemaakt';
-$lang['customers_successful_updating']='Wijzingen klantgegevens bewaard voor ';
+$lang['customers_successful_updating']='Wijzigingen klantgegevens bewaard voor ';
 $lang['customers_successful_deleted']='Er werd(en)';
 $lang['customers_one_or_multiple']='klant(en) verwijderd';
 $lang['customers_cannot_be_deleted']='De geselecteerde klanten konden niet worden verwijderd. Eén of meerdere klanten hebben verkoopsgegevens in de database zitten.';
 $lang['customers_basic_information']='Klantgegevens';
-$lang['customers_account_number']='Btw nummer';
+$lang['customers_account_number']='Btwnummer';
 $lang['customers_taxable']='Belastbaar';
 ?>
\ No newline at end of file
diff --git a/application/language/nl-BE/employees_lang.php b/application/language/nl-BE/employees_lang.php
index 7f8955011..8266fc80e 100755
--- a/application/language/nl-BE/employees_lang.php
+++ b/application/language/nl-BE/employees_lang.php
@@ -1,6 +1,6 @@
 <?php
 $lang['employees_employee']='Werknemer';
-$lang['employees_new']='Nieuwe Werknemer';
+$lang['employees_new']='N. Werknemer';
 $lang['employees_update']='Update Werknemer';
 $lang['employees_confirm_delete']='Bent u zeker dat u de geselecteerde werknemers wil verwijderen?';
 $lang['employees_none_selected']='U hebt geen werknemers geselecteerd';
diff --git a/application/language/nl-BE/item_kits_lang.php b/application/language/nl-BE/item_kits_lang.php
index 6c3dd5857..4d6c87bbc 100644
--- a/application/language/nl-BE/item_kits_lang.php
+++ b/application/language/nl-BE/item_kits_lang.php
@@ -1,19 +1,19 @@
 <?php
-$lang['item_kits_name'] = 'Product Kit Naam';
-$lang['item_kits_description'] = 'Product Kit Omschrijving';
-$lang['item_kits_no_item_kits_to_display'] = 'Geen item kits gevonden';
-$lang['item_kits_update'] = 'Bewaar Product Kit';
-$lang['item_kits_new'] = 'Maak Item Product';
-$lang['item_kits_none_selected'] = "U hebt geen product kits geselecteerd";
-$lang['item_kits_info'] = 'Product Kit Info';
-$lang['item_kits_successful_adding'] = 'Product kit succesvol toegevoegd';
-$lang['item_kits_successful_updating'] = 'Wijzigingen product kit bewaard';
-$lang['item_kits_error_adding_updating'] = 'Fout bij het toevoegen/aanpassen van een product kit';
+$lang['item_kits_name'] = 'Naam';
+$lang['item_kits_description'] = 'Omschrijving';
+$lang['item_kits_no_item_kits_to_display'] = 'Geen sets gevonden';
+$lang['item_kits_update'] = 'Bewaar Set';
+$lang['item_kits_new'] = 'Nieuwe Set';
+$lang['item_kits_none_selected'] = "U hebt geen sets geselecteerd";
+$lang['item_kits_info'] = 'Product Set Info';
+$lang['item_kits_successful_adding'] = 'Product set succesvol toegevoegd';
+$lang['item_kits_successful_updating'] = 'Wijzigingen product set bewaard';
+$lang['item_kits_error_adding_updating'] = 'Fout bij het toevoegen/aanpassen van een set';
 $lang['item_kits_successful_deleted'] = 'Er werd(en)';
-$lang['item_kits_confirm_delete'] = 'Bent u zeker dat u de geselecteerde product kits wil verwijderen?';
-$lang['item_kits_one_or_multiple'] = 'product kit(s) verwijderd';
-$lang['item_kits_cannot_be_deleted'] = 'De product kits konden niet worden verwijderd';
-$lang['item_kits_add_item'] = 'Nieuw product';
+$lang['item_kits_confirm_delete'] = 'Bent u zeker dat u de geselecteerde sets wil verwijderen?';
+$lang['item_kits_one_or_multiple'] = 'Product set(s) verwijderd';
+$lang['item_kits_cannot_be_deleted'] = 'De sets konden niet worden verwijderd';
+$lang['item_kits_add_item'] = 'Nieuw Product';
 $lang['item_kits_items'] = 'Producten';
 $lang['item_kits_item'] = 'Product';
 $lang['item_kits_quantity'] = 'In stock';
diff --git a/application/language/nl-BE/items_lang.php b/application/language/nl-BE/items_lang.php
index cf69972c1..fcbf8ce85 100755
--- a/application/language/nl-BE/items_lang.php
+++ b/application/language/nl-BE/items_lang.php
@@ -11,7 +11,6 @@ $lang['items_number_information'] = 'Productnummer';
 $lang['items_new'] = 'Nieuw Product';
 $lang['items_update'] = 'Bewerk Product';
 $lang['items_item'] = 'Product';
-$lang['items_reference_number']='Referentienummer';
 $lang['items_edit_multiple_items'] = 'Meerdere Producten Bewerken';
 $lang['items_name'] = 'Productnaam';
 $lang['items_category'] = 'Categorie';
@@ -22,9 +21,9 @@ $lang['items_tax_2'] = 'VAT 2';
 $lang['items_sales_tax_1'] = 'VAT';
 $lang['items_sales_tax_2'] = 'VAT 2';
 $lang['items_tax_percent'] = 'VAT %';
-$lang['items_tax_percents'] = 'VAT Percentage(s)';
+$lang['items_tax_percents'] = 'VAT';
 $lang['items_reorder_level'] = 'Reorder Level';
-$lang['items_quantity'] = 'In Stock';
+$lang['items_quantity'] = 'Stock';
 $lang['items_reorder_level'] = 'Reorder Level';
 $lang['items_no_items_to_display'] = 'Er werden geen producten gevonden';
 $lang['items_bulk_edit'] = 'Bewerk Selectie';
diff --git a/application/language/nl-BE/items_lang.php~ b/application/language/nl-BE/items_lang.php~
deleted file mode 100755
index 68b21dba7..000000000
--- a/application/language/nl-BE/items_lang.php~
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-$lang['items_item_number']='UPC/EAN/ISBN';
-$lang['items_retrive_item_info']='Haal productinformatie op';
-$lang['items_description']='Omschrijving';
-$lang['items_amazon']='Amazon';
-$lang['items_upc_database']='UPC Database';
-$lang['items_cannot_find_item']='Er werd geen informatie gevonden omtrent product';
-$lang['items_info_provided_by']='Info provided by';
-$lang['items_basic_information']='Productinformatie';
-$lang['items_number_information']='Productnummer';
-$lang['items_new']='Nieuw Product';
-$lang['items_update']='Bewerk Product';
-$lang['items_item']='Product';
-$lang['items_reference_number']='Referentienummer';
-$lang['items_edit_multiple_items']='Meerdere Producten Bewerken';
-$lang['items_name']='Productnaam';
-$lang['items_category']='Categorie';
-$lang['items_cost_price']='Aankoopprijs';
-$lang['items_unit_price']='Verkoopprijs';
-$lang['items_tax_1']='VAT';
-$lang['items_tax_2']='VAT 2';
-$lang['items_sales_tax_1'] = 'VAT';
-$lang['items_sales_tax_2'] = 'VAT 2';
-$lang['items_tax_percent']='VAT %';
-$lang['items_tax_percents']='VAT Percentage(s)';
-$lang['items_quantity']='In Stock';
-$lang['items_reorder_level']='Reorder Level';
-$lang['items_no_items_to_display']='Er werden geen producten gevonden';
-$lang['items_bulk_edit']='Bewerk Selectie';
-$lang['items_confirm_delete']='Bent u zeker dat u de geselecteerde producten wil verwijderen?';
-$lang['items_none_selected']='U hebt geen producten geselecteerd';
-$lang['items_confirm_bulk_edit']='Bent u zeker dat u de geselecteerde producten wil aanpassen?';
-$lang['items_successful_bulk_edit']='Producten werden succesvol bewaard';
-$lang['items_error_updating_multiple']='Fout bij het bewaren van producten';
-$lang['items_edit_fields_you_want_to_update']='Bewerk de velden aan die u wil aanpassen voor ALLE geselecteerde producten';
-$lang['items_error_adding_updating'] = 'Fout bij het toevoegen/aanpassen van een product';
-$lang['items_successful_adding']='Product succesvol toegevoegd';
-$lang['items_successful_updating']='Wijzigingen bewaard voor';
-$lang['items_successful_deleted']='Er werd(en)';
-$lang['items_one_or_multiple']='product(en) verwijderd';
-$lang['items_cannot_be_deleted']='De geselecteerde producten konden niet worden verwijderd.';
-$lang['items_name_required']='Productnaam moet ingevuld worden';
-$lang['items_category_required']='Categorie moet ingevuld worden';
-$lang['items_buy_price_required']='Buy price is a required field';
-$lang['items_unit_price_required']='Verkoopprijs moet ingevuld worden';
-$lang['items_cost_price_required']='Aankoopprijs moet ingevuld worden';
-$lang['items_tax_percent_required']='Taxpercentage moet ingevuld worden';
-$lang['items_quantity_required']='Hoeveelheid moet ingevuld worden';
-$lang['items_reorder_level_required']='Reorder level moet ingevuld worden';
-$lang['items_unit_price_number']='Verkoopprijs moet een cijfer zijn';
-$lang['items_cost_price_number']='Kostprijs moet een cijfer zijn';
-$lang['items_quantity_number']='Hoeveelheid moet een cijfer zijn';
-$lang['items_reorder_level_number']='Reorder level moet een cijfer zijn';
-$lang['items_none'] = 'Geen';
-$lang['items_supplier'] = 'Leverancier';
-$lang['items_generate_barcodes'] = 'Genereer Barcodes';
-$lang['items_must_select_item_for_barcode'] = 'U moet ten minste 1 product selecteren om een barcode te genereren';
-$lang['items_excel_import_failed'] = 'Excel import mislukt';
-$lang['items_allow_alt_desciption'] = 'Aanpasbare omschrijving';
-$lang['items_is_serialized'] = 'Optelbaar';
-$lang['items_low_inventory_items'] = 'Producten niet in stock';
-$lang['items_serialized_items'] = 'Optelbare producten';
-$lang['items_no_description_items'] = 'Producten zonder omschrijving';
-$lang['items_search_custom_items'] = 'Doorzoek Tags';//GARRISON ADDED
-$lang['items_inventory_comments']='Commentaar';
-$lang['items_count']='Update Stock';
-$lang['items_details_count']='Stockgegevens';
-$lang['items_add_minus']='Corrigatie hoeveelheid';
-$lang['items_current_quantity']='Huidige Hoeveelheid';
-$lang['items_quantity_required']='Hoeveelheid moet ingevuld worden. Druk sluit ( X ) om te annuleren';
-$lang['items_do_nothing'] = 'Doe Niets';
-$lang['items_change_all_to_serialized'] = 'Genummerd';
-$lang['items_change_all_to_unserialized'] = 'Niet genummerd';
-$lang['items_change_all_to_allow_alt_desc'] = 'Aanpasb. omschrijvingen';
-$lang['items_change_all_to_not_allow_allow_desc'] = 'Vaste omschrijvingen';
-$lang['items_use_inventory_menu'] = 'Use Inv. Menu';
-$lang['items_manually_editing_of_quantity'] = 'Manuele aanpassing hoeveelheid';
-$lang['items_inventory'] = 'Stock';
-$lang['items_location'] = 'Locatie';
-?>
diff --git a/application/language/nl-BE/module_lang.php b/application/language/nl-BE/module_lang.php
index 5d7f57da2..95443e686 100755
--- a/application/language/nl-BE/module_lang.php
+++ b/application/language/nl-BE/module_lang.php
@@ -28,7 +28,7 @@ $lang['module_receivings_desc'] = 'Verwerk binnenkomende orders';
 $lang['module_giftcards'] = 'Cadeaubons';
 $lang['module_giftcards_desc'] = 'Zoek, bewerk, verwijder en voeg cadeaubons toe';
 
-$lang['module_item_kits'] = 'Item Kits';
-$lang['module_item_kits_desc'] = 'Zoek, bewerk, verwijder en voeg item kits toe';
+$lang['module_item_kits'] = 'Productsets';
+$lang['module_item_kits_desc'] = 'Zoek, bewerk, verwijder en voeg productsets toe';
 
 ?>
diff --git a/application/language/nl-BE/reports_lang.php b/application/language/nl-BE/reports_lang.php
index b87c62988..9975b6af3 100755
--- a/application/language/nl-BE/reports_lang.php
+++ b/application/language/nl-BE/reports_lang.php
@@ -73,9 +73,16 @@ $lang['reports_reorder_level'] = 'Reorder Level';
 $lang['reports_low_inventory_report'] = 'Rapport Herbevoorrading';
 $lang['reports_item_name'] = 'Product Naam';
 $lang['reports_inventory_summary_report'] = 'Rapport Overzicht Vooraad';
+$lang['reports_payment_type'] = 'Payment Type';
 $lang['reports_payments_summary_report'] = 'Overzicht Betalingen';
 $lang['reports_payments'] = 'Betalingen';
 $lang['reports_sale_type'] = 'Type';
+$lang['reports_receivings'] = 'Orders';
+$lang['reports_received_by'] = 'Ontvangen door';
+$lang['reports_supplied_by'] = 'Geleverd door';
+$lang['reports_items_received'] = 'Items Ontvangen';
+$lang['reports_detailed_receivings_report'] = 'Gedetailleerd Raport Orders';
 $lang['reports_all'] = 'Alle';
 $lang['reports_returns'] = 'Retour';
+$lang['reports_discount'] = 'Kortingen';
 ?>
\ No newline at end of file
diff --git a/application/language/nl-BE/sales_lang.php b/application/language/nl-BE/sales_lang.php
index 2f742f340..460c40472 100755
--- a/application/language/nl-BE/sales_lang.php
+++ b/application/language/nl-BE/sales_lang.php
@@ -4,24 +4,15 @@ $lang['sales_giftcard']='Cadeaubon';
 $lang['sales_register']='Kassa';
 $lang['sales_mode']='Type Registratie';
 $lang['sales_new_item'] = 'Nieuw Product';
-$lang['sales_update']='Bewerk Ticket';
-$lang['sales_basic_information']='Ticket gegevens';
-$lang['sales_item_name'] = 'Productnaam';
-$lang['sales_item_name_short'] = 'Naam';
-$lang['sales_item_number'] = 'Productnummer';
-$lang['sales_inventory'] = 'Stock';
-$lang['sales_item_number_short'] = 'Prnr.';
+$lang['sales_item_name'] = 'Naam';
+$lang['sales_item_number'] = 'Product #';
 $lang['sales_new_customer'] = 'Nieuwe klant';
 $lang['sales_customer'] = 'Klant';
 $lang['sales_no_items_in_cart']='Er zijn geen aankopen geselecteerd';
 $lang['sales_total']='Totaal';
-$lang['sales_total_without_tax']='Totaal excl. VAT';
 $lang['sales_tax_percent']='VAT %';
 $lang['sales_price']='Ecxl. VAT';
-$lang['sales_taxed_price']='Prijs';
-$lang['sales_taxed_price_short']='Prijs';
 $lang['sales_quantity']='Aantal';
-$lang['sales_quantity_short']='Aant.';
 $lang['sales_discount']='%';
 $lang['sales_edit']='Bewerk';
 $lang['sales_payment']='Betaalmethode';
@@ -34,66 +25,59 @@ $lang['sales_start_typing_customer_name']='Typ naam klant...';
 $lang['sales_sub_total']='Subtotaal excl. VAT';
 $lang['sales_tax']='VAT';
 $lang['sales_comment']='Commentaar';
-$lang['sales_date']='Datum';
-$lang['sales_delete_entire_sale']='Verwijder';
-$lang['sales_delete_confirmation']='Delete';
-$lang['sales_delete_confirmation']='Bent u zeker dat u deze aankoop wil verwijderen?';
-$lang['sales_employee']='Werknemer';
-$lang['sales_invoice_number']='Factuur #';
-$lang['sales_invoice']='Factuur';
 $lang['sales_unable_to_add_item']='Onmogelijk om product toe te voegen';
-$lang['sales_successfully_updated']='Wijzigingen bewaard voor ticket';
-$lang['sales_unsuccessfully_updated']='Fout bij het bewaren van ticket';
-$lang['sales_date_required']='Datum moet ingevuld worden';
-$lang['sales_date_type']='Geen correcte datum ingevuld';
-$lang['sales_invoice_number_type']='Geen correcte factuurnummer ingevuld (yyyy/xxx)';
 $lang['sales_sale_for_customer']='Klant:';
 $lang['sales_remove_customer']='Verwijder Klant';
 $lang['sales_error_editing_item']='Fout bij bewerken';
 $lang['sales_complete_sale']='Bevestig';
 $lang['sales_cancel_sale']='Annuleer';
 $lang['sales_add_payment']='Betaal';
-$lang['sales_receipt']='Ticket';
 $lang['sales_receipt_number']='Ticket #';
 $lang['sales_id']='Nummer Verkoop ';
 $lang['sales_sale']='Verkoop';
 $lang['sales_return']='Retour';
-$lang['sales_return_policy']='Retourvoorwaarden';
-$lang['sales_no_description'] = 'Geen';
 $lang['sales_confirm_finish_sale'] = 'Bent u zeker dat u deze aankoop wil invoeren? Dit kan niet ongedaan gemaakt worden.';
 $lang['sales_confirm_cancel_sale'] = 'Bent u zeker dat u deze aankoop wil verwijderen?';
-$lang['sales_confirm_delete']='Bent u zeker dat u de geselecteerde aankopen wil verwijderen?';
-$lang['sales_successful_deleted']='Er werd(en)';
-$lang['sales_one_or_multiple']='aanko(o)p(en) verwijderd';
-$lang['sales_none_selected']='U hebt geen aankopen geselecteerd';
-$lang['sales_cannot_be_deleted']='De geselecteerde aankopen konden niet worden verwijderd.';
 $lang['sales_cash'] = 'Contant';
 $lang['sales_check'] = 'Waardebon';
 $lang['sales_debit'] = 'Bancontact';
 $lang['sales_credit'] = 'Kredietkaart';
+$lang['sales_giftcard'] = 'Cadeaubon';
 $lang['sales_amount_tendered'] = 'Ontvangen bedrag';
-$lang['sales_check_due'] = 'Waardebon terug';
 $lang['sales_change_due'] = 'Wisselgeld terug';
-$lang['sales_payment_total'] = "Betaald Bedrag";
-$lang['sales_payment_type'] = "Type";
-$lang['sales_payment_amount'] = "Bedrag";
-$lang['sales_print_invoice'] = "Factuur";
-$lang['sales_invoice_amount_due'] = "Te betalen";
-$lang['sales_payment_amount_due'] = "Resterend";
 $lang['sales_payment_not_cover_total'] = 'Betaalde hoeveelheid is onvoldoende';
 $lang['sales_transaction_failed'] = 'Transactie mislukt';
 $lang['sales_must_enter_numeric'] = 'Het ontvangen bedrag moet een numerieke waarde zijn';
-$lang['sales_no_sales_to_display']='Er werden geen aankopen gevonden';
+$lang['sales_must_enter_numeric_giftcard'] = 'Er moet een geldige code worden ingevuld voor de cadeaubon';
 $lang['sales_serial'] = 'Nummer';
-$lang['sales_send_invoice'] = 'Verstuur factuur';
-$lang['sales_invoice_confirm'] = 'Deze factuur zal verstuurd worden naar ';
-$lang['sales_invoice_sent'] = 'Factuur verstuurd naar ';
-$lang['sales_invoice_mail_body'] = 'In bijlage vindt u uw factuur.<br><br>mvg,<br><br>Runwalk Herentals';
-$lang['sales_invoice_unsent'] = 'Fout bij het versturen van factuur naar ';
-$lang['sales_invoice_no_email'] = 'Er werd geen email adres gevonden voor deze klant';
 $lang['sales_description_abbrv'] = 'Omschr.';
-$lang['sales_invoices_filter'] = 'Filter aankopen op';
 $lang['sales_item_out_of_stock'] = 'Product is niet meer in voorraad';
-$lang['sales_item_insufficient_of_stock'] = 'Product is niet meer in voorraad';
+$lang['sales_item_insufficient_of_stockfi'] = 'Product is niet meer in voorraad';
 $lang['sales_quantity_less_than_zero'] = 'Waarschuwing, de gewenste hoeveelheid is onvoldoende. U kunt deze aankoop verwerken, maar kijk toch even de voorraad na.';
+$lang['sales_successfully_updated']='Wijzigingen bewaard voor ticket';
+$lang['sales_unsuccessfully_updated']='Fout bij het bewaren van ticket';
+$lang['sales_edit_sale']='Bewerk Ticket';
+$lang['sales_employee']='Werknemer';
+$lang['sales_delete_successful']='De geselecteerde aanko(o)p(en) werden verwijderd';
+$lang['sales_delete_unsuccessful']='De geselecteerde aankopen konden niet worden verwijderd.';
+$lang['sales_delete_entire_sale']='Verwijder';
+$lang['sales_delete_confirmation']='Bent u zeker dat u deze aankoop wil verwijderen?';
+$lang['sales_date']='Datum';
+$lang['sales_delete_successful'] = 'U hebt een aankoop verwijderd';
+$lang['sales_delete_unsuccessful'] = 'U kan deze aankoop niet verwijderen';
+$lang['sales_suspend_sale'] = 'Bewaar aankoop';
+$lang['sales_confirm_suspend_sale'] = 'Are you sure you want to suspend this sale?';
+$lang['sales_suspended_sales'] = 'Bewaarde Aankopen';
+$lang['sales_suspended_sale_id'] = 'ID';
+$lang['sales_date'] = 'Date';
+$lang['sales_comments'] = 'Commentaar';
+$lang['sales_unsuspend_and_delete'] = '';
+$lang['sales_unsuspend'] = 'Hervat';
+$lang['sales_successfully_suspended_sale'] = 'Uw aankoop werd met sucess bewaard';
+$lang['sales_email_receipt'] = 'E-Mail Ticket';
+$lang['sales_discount_short']='%';
+$lang["sales_discount_included"]='% Korting';
+$lang['sales_sale_time']='Datum';
+$lang['sales_payments_total'] = 'Betaald bedrag';
+$lang['sales_amount_due'] = 'Te betalen';
 ?>
\ No newline at end of file
diff --git a/application/language/nl-BE/suppliers_lang.php b/application/language/nl-BE/suppliers_lang.php
index 266e00128..d75e45b5b 100755
--- a/application/language/nl-BE/suppliers_lang.php
+++ b/application/language/nl-BE/suppliers_lang.php
@@ -1,5 +1,5 @@
 <?php
-$lang['suppliers_new']='Maak Leverancier';
+$lang['suppliers_new']='N. Leverancier';
 $lang['suppliers_supplier']='Leverancier';
 $lang['suppliers_update']='Bewerk Leverancier';
 $lang['suppliers_confirm_delete']='Bent u zeker dat u de geselecteerde leveranciers wil verwijderen?';
diff --git a/application/models/giftcard.php b/application/models/giftcard.php
index c081858da..10e894b65 100644
--- a/application/models/giftcard.php
+++ b/application/models/giftcard.php
@@ -233,7 +233,7 @@ class Giftcard extends CI_Model
 		$this->db->or_like("giftcards.person_id",$this->db->escape_like_str($search));
 		$this->db->where('deleted',$this->db->escape('0'));
 		$this->db->order_by("giftcard_number", "asc");
-		return $this->db->get();
+		return $this->db->get();
 	}
 	
 	public function get_giftcard_value( $giftcard_number )
diff --git a/application/models/item.php b/application/models/item.php
index f38fd971e..ab9a9c8f1 100644
--- a/application/models/item.php
+++ b/application/models/item.php
@@ -236,7 +236,7 @@ class Item extends CI_Model
 
 /** GARRISON ADDED 4/22/2013 **/
 	//Search by custom fields
-		$this->db->from('items');
+		$this->db->from('items');
 		$this->db->like('custom1', $search);
 		$this->db->or_like('custom2', $search);
 		$this->db->or_like('custom3', $search);
@@ -253,7 +253,7 @@ class Item extends CI_Model
 		foreach($by_name->result() as $row)
 		{
 			$suggestions[]=$row->name;
-		}
+		}
 /** END GARRISON ADDED **/		
 		
 	//only return $limit suggestions
@@ -303,7 +303,7 @@ class Item extends CI_Model
 		/** GARRISON ADDED 4/22/2013 **/		
 	//Search by custom fields
 		$this->db->from('items');
-		$this->db->where('deleted',0);
+		$this->db->where('deleted',0);
 		$this->db->like('custom1', $search);
 		$this->db->or_like('custom2', $search);
 		$this->db->or_like('custom3', $search);
@@ -319,7 +319,7 @@ class Item extends CI_Model
 		foreach($by_description->result() as $row)
 		{
 			$suggestions[]=$row->item_id.'|'.$row->name;
-		}
+		}
 		/** END GARRISON ADDED **/
 		
 		//only return $limit suggestions
@@ -383,7 +383,7 @@ class Item extends CI_Model
 		}
 	
 		return $suggestions;
-	}
+	}
 	
 	function get_custom2_suggestions($search)
 	{
diff --git a/application/models/person.php b/application/models/person.php
index d44f52456..5461f1041 100644
--- a/application/models/person.php
+++ b/application/models/person.php
@@ -96,7 +96,7 @@ class Person extends CI_Model
 //		$this->db->from('people');
 //		$this->db->where('deleted',0);
 //		$this->db->where('person_id',$this->db->escape($search));
-//		$this->db->like('first_name',$this->db->escape_like_str($search));
+//		$this->db->like('first_name',$this->db->escape_like_str($search));
 //		$this->db->or_like('last_name',$this->db->escape_like_str($search));
 //		$this->db->or_like("CONCAT(`first_name`,' ',`last_name`)",$this->db->escape_like_str($search));
 //		$this->db->or_like('email',$search);
@@ -114,7 +114,7 @@ class Person extends CI_Model
 		{
 			$suggestions = array_slice($suggestions, 0,$limit);
 		}
-		return $suggestions;
+		return $suggestions;
 	}
 	
 	/*
diff --git a/application/models/receiving.php b/application/models/receiving.php
index 868aea60c..48ae9dca1 100644
--- a/application/models/receiving.php
+++ b/application/models/receiving.php
@@ -115,4 +115,4 @@ class Receiving extends CI_Model
 
 
 }
-?>
+?>
diff --git a/application/views/items/form_bulk.php b/application/views/items/form_bulk.php
index accbdfa30..1ec3d67d7 100644
--- a/application/views/items/form_bulk.php
+++ b/application/views/items/form_bulk.php
@@ -134,7 +134,6 @@ echo form_open('items/bulk_update/',array('id'=>'item_form'));
 <?php echo form_label($this->lang->line('items_allow_alt_description').':', 'allow_alt_description',array('class'=>'wide')); ?>
 	<div class='form_field'>
 	<?php echo form_dropdown('allow_alt_description', $allow_alt_description_choices);?>
-
 	</div>
 
 </div>
diff --git a/application/views/partial/header.php b/application/views/partial/header.php
index 722c5ac8a..3f65a343f 100644
--- a/application/views/partial/header.php
+++ b/application/views/partial/header.php
@@ -4,7 +4,7 @@
 <head>
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 	<base href="<?php echo base_url();?>" />
-	<title><?php echo $this->config->item('company').' -- '.$this->lang->line('common_powered_by').' Open Source Point Of Sale' ?></title>
+	<title><?php echo $this->config->item('company').' -- '.$this->lang->line('common_powered_by').' OS Point Of Sale' ?></title>
 	<link rel="stylesheet" rev="stylesheet" href="<?php echo base_url();?>css/ospos.css" />
 	<link rel="stylesheet" rev="stylesheet" href="<?php echo base_url();?>css/ospos_print.css"  media="print"/>
 	<script>BASE_URL = '<?php echo site_url(); ?>';</script>
diff --git a/application/views/suppliers/form.php b/application/views/suppliers/form.php
index fb7bffff1..e3fcac17f 100644
--- a/application/views/suppliers/form.php
+++ b/application/views/suppliers/form.php
@@ -75,4 +75,5 @@ $(document).ready(function()
 		}
 	});
 });
+
 </script>
\ No newline at end of file
diff --git a/css/general.css b/css/general.css
index 5d8373ba9..19629b365 100644
--- a/css/general.css
+++ b/css/general.css
@@ -65,7 +65,7 @@ label.required
 	top:30%;
 	left:0%;
 	color:#FFF;
-	font-size:11px;
+	font-size:0.9em;
 	font-weight:bold;
 	text-align:center;
 }
@@ -96,7 +96,7 @@ label.required
 	width:100%;
 	top:35%;
 	color:#FFF;
-	font-size:13px;
+	font-size:0.8em;
 	font-weight:bold;
 	text-align:center;
 }
@@ -140,6 +140,16 @@ input
 	padding: 3px;
 }
 
+input#search
+{
+	padding: 0px;
+}
+
+#select_customer_form input, #select_supplier_form input
+{
+	width: 95%;
+}
+
 .clearfix:after 
 {
 	content: ".";
diff --git a/css/ospos.css b/css/ospos.css
index 7cbf4c522..b1cf81c01 100644
--- a/css/ospos.css
+++ b/css/ospos.css
@@ -15,6 +15,8 @@ body
 	margin:0px;
 	padding:0px;
 	background-color:#f7f7f7;
+	font-family: "Lucida Grande", "Trebuchet MS", Tahoma, Verdana, sans-serif;
+	font-size: 0.9em;
 }
 
 a.none
@@ -93,8 +95,6 @@ a.none
 {
 	position:absolute;
 	display:none;
-	right:21%;
-	top:5px;
 }
 
 #feedback_bar
diff --git a/css/tables.css b/css/tables.css
index 0f71cb853..a584c61a7 100644
--- a/css/tables.css
+++ b/css/tables.css
@@ -8,7 +8,7 @@
 	border-top:1px solid #CCCCCC;	
 	background-position:5px 10px;
 	background-repeat:no-repeat;	
-	padding:3px 0px 3px 0px;
+	padding:5px 0px 5px 0px;
 }
 
 #table_action_header ul
@@ -30,7 +30,6 @@
 {
 	background-color:#0a6184;
 	border:2px solid #DDDDDD;
-	font-size:14px;
 	padding:2px 5px 2px 5px;
 	
 }
@@ -61,6 +60,7 @@ table.tablesorter thead tr th, table.tablesorter tfoot tr th
 	text-align:left;
 	background-color:#4386a1;
 	padding: 0px 5px 0px 5px;
+	
 }
 
 table.tablesorter thead tr .header 
@@ -77,7 +77,6 @@ table.tablesorter tbody td
 	background-color: #FFF;
 	vertical-align: top;
 	padding: 0px 5px 0px 5px;
-	
 }
 
 table.tablesorter tbody td 
diff --git a/database/database.sql b/database/database.sql
index 47f7dd091..13e4d0d8f 100644
--- a/database/database.sql
+++ b/database/database.sql
@@ -91,7 +91,7 @@ CREATE TABLE `ospos_giftcards` (
   `giftcard_number` varchar(25) COLLATE utf8_unicode_ci NOT NULL,
   `value` double(15,2) NOT NULL,
   `deleted` int(1) NOT NULL DEFAULT '0',
-  `person_id` INT NOT NULL
+  `person_id` INT NOT NULL,
   PRIMARY KEY (`giftcard_id`),
   UNIQUE KEY `giftcard_number` (`giftcard_number`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=48 ;
diff --git a/import_items.csv b/import_items.csv
index 8c5d91866..10f71bc52 100644
--- a/import_items.csv
+++ b/import_items.csv
@@ -1,2 +1,2 @@
-UPC/EAN/ISBN,Item Name,Category,Supplier ID,Cost Price,Unit Price,Tax 1 Name,Tax 1 Percent,Tax 2 Name ,Tax 2 Percent,Quantity,Reorder Level,Location,Description,Allow Alt Description,Item has Serial Number,custom1,custom2,custom3,custom4,custom5,custom6,custom7,custom8,custom9,custom10
+UPC/EAN/ISBN,Item Name,Category,Supplier ID,Cost Price,Unit Price,Tax 1 Name,Tax 1 Percent,Tax 2 Name ,Tax 2 Percent,Quantity,Reorder Level,Location,Description,Allow Alt Description,Item has Serial Number,custom1,custom2,custom3,custom4,custom5,custom6,custom7,custom8,custom9,custom10
 33333333,Apple iMac,Computers,,800,1200,Tax 1,8,Tax 2,10,10,1,Earth,Best Computer ever,y,,"Oz, Frank",The Bunny and the Hill,"Monkeys,Giraffes,Gorillas",English,New,Apple,,1999,D3lk3jlkjs,Hardbound
\ No newline at end of file
diff --git a/index.php b/index.php
index f4ac11a72..54e5e605d 100644
--- a/index.php
+++ b/index.php
@@ -18,7 +18,7 @@
  * NOTE: If you change these, also change the error_reporting() code below
  *
  */
-	define('ENVIRONMENT', 'development');
+	define('ENVIRONMENT', 'production');
 /*
  *---------------------------------------------------------------
  * ERROR REPORTING
diff --git a/license/license.txt b/license/license.txt
index 7af154728..3c6b4410f 100644
--- a/license/license.txt
+++ b/license/license.txt
@@ -1,19 +1,19 @@
-Copyright (C) 2011 by Pappas Technologies, LLC
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+Copyright (C) 2011 by Pappas Technologies, LLC
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
\ No newline at end of file
diff --git a/system/language/english/calendar_lang.php b/system/language/en/calendar_lang.php
similarity index 100%
rename from system/language/english/calendar_lang.php
rename to system/language/en/calendar_lang.php
diff --git a/system/language/english/date_lang.php b/system/language/en/date_lang.php
similarity index 100%
rename from system/language/english/date_lang.php
rename to system/language/en/date_lang.php
diff --git a/system/language/english/db_lang.php b/system/language/en/db_lang.php
similarity index 100%
rename from system/language/english/db_lang.php
rename to system/language/en/db_lang.php
diff --git a/system/language/english/email_lang.php b/system/language/en/email_lang.php
similarity index 100%
rename from system/language/english/email_lang.php
rename to system/language/en/email_lang.php
diff --git a/application/language/english/form_validation_lang.php b/system/language/en/form_validation_lang.php
similarity index 100%
rename from application/language/english/form_validation_lang.php
rename to system/language/en/form_validation_lang.php
diff --git a/system/language/english/ftp_lang.php b/system/language/en/ftp_lang.php
similarity index 100%
rename from system/language/english/ftp_lang.php
rename to system/language/en/ftp_lang.php
diff --git a/system/language/english/imglib_lang.php b/system/language/en/imglib_lang.php
similarity index 100%
rename from system/language/english/imglib_lang.php
rename to system/language/en/imglib_lang.php
diff --git a/system/language/english/index.html b/system/language/en/index.html
similarity index 100%
rename from system/language/english/index.html
rename to system/language/en/index.html
diff --git a/system/language/english/migration_lang.php b/system/language/en/migration_lang.php
similarity index 100%
rename from system/language/english/migration_lang.php
rename to system/language/en/migration_lang.php
diff --git a/system/language/english/number_lang.php b/system/language/en/number_lang.php
similarity index 100%
rename from system/language/english/number_lang.php
rename to system/language/en/number_lang.php
diff --git a/system/language/english/profiler_lang.php b/system/language/en/profiler_lang.php
similarity index 100%
rename from system/language/english/profiler_lang.php
rename to system/language/en/profiler_lang.php
diff --git a/system/language/english/unit_test_lang.php b/system/language/en/unit_test_lang.php
similarity index 100%
rename from system/language/english/unit_test_lang.php
rename to system/language/en/unit_test_lang.php
diff --git a/system/language/english/upload_lang.php b/system/language/en/upload_lang.php
similarity index 100%
rename from system/language/english/upload_lang.php
rename to system/language/en/upload_lang.php
diff --git a/system/language/english/form_validation_lang.php b/system/language/english/form_validation_lang.php
deleted file mode 100644
index 3418f29ab..000000000
--- a/system/language/english/form_validation_lang.php
+++ /dev/null
@@ -1,29 +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 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_unique'] 			= "The %s field must contain a unique value.";
-$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.";
-$lang['decimal']			= "The %s field must contain a decimal number.";
-$lang['less_than']			= "The %s field must contain a number less than %s.";
-$lang['greater_than']		= "The %s field must contain a number greater than %s.";
-
-
-/* End of file form_validation_lang.php */
-/* Location: ./system/language/english/form_validation_lang.php */
\ No newline at end of file
diff --git a/system/language/nl-BE/calendar_lang.php b/system/language/nl-BE/calendar_lang.php
new file mode 100755
index 000000000..a0184db28
--- /dev/null
+++ b/system/language/nl-BE/calendar_lang.php
@@ -0,0 +1,46 @@
+<?php
+$lang['cal_su'] = 'Zo';
+$lang['cal_mo'] = 'Ma';
+$lang['cal_tu'] = 'Di';
+$lang['cal_we'] = 'Wo';
+$lang['cal_th'] = 'Do';
+$lang['cal_fr'] = 'Vr';
+$lang['cal_sa'] = 'Za';
+$lang['cal_sun'] = 'Zo';
+$lang['cal_mon'] = 'Ma';
+$lang['cal_tue'] = 'Di';
+$lang['cal_wed'] = 'Wo';
+$lang['cal_thu'] = 'Do';
+$lang['cal_fri'] = 'Vr';
+$lang['cal_sat'] = 'Za';
+$lang['cal_sunday'] = 'Zondag';
+$lang['cal_monday'] = 'Maandag';
+$lang['cal_tuesday'] = 'Dinsdag';
+$lang['cal_wednesday'] = 'Woensdag';
+$lang['cal_thursday'] = 'Donderdag';
+$lang['cal_friday'] = 'Vrijdag';
+$lang['cal_saturday'] = 'Zaterdag';
+$lang['cal_jan'] = 'Jan';
+$lang['cal_feb'] = 'Feb';
+$lang['cal_mar'] = 'Mrt';
+$lang['cal_apr'] = 'Apr';
+$lang['cal_may'] = 'Mei';
+$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'] = 'Januari';
+$lang['cal_february'] = 'Februari';
+$lang['cal_march'] = 'Maart';
+$lang['cal_april'] = 'April';
+$lang['cal_mayl'] = 'Mei';
+$lang['cal_june'] = 'Juni';
+$lang['cal_july'] = 'Juli';
+$lang['cal_august'] = 'Augustus';
+$lang['cal_september'] = 'September';
+$lang['cal_october'] = 'October';
+$lang['cal_november'] = 'November';
+$lang['cal_december'] = 'December';
diff --git a/system/language/nl-BE/date_lang.php b/system/language/nl-BE/date_lang.php
new file mode 100755
index 000000000..c2eac566f
--- /dev/null
+++ b/system/language/nl-BE/date_lang.php
@@ -0,0 +1,55 @@
+<?php
+$lang['date_year'] = 'Jaar';
+$lang['date_years'] = 'Jaren';
+$lang['date_month'] = 'Maand';
+$lang['date_months'] = 'Maanden';
+$lang['date_week'] = 'Week';
+$lang['date_weeks'] = 'Weken';
+$lang['date_day'] = 'Dag';
+$lang['date_days'] = 'Dagen';
+$lang['date_hour'] = 'Uur';
+$lang['date_hours'] = 'Uren';
+$lang['date_minute'] = 'Minuut';
+$lang['date_minutes'] = 'Minuten';
+$lang['date_second'] = 'Seconde';
+$lang['date_seconds'] = 'Seconden';
+$lang['UM12'] = '(UTC -12:00) Baker/Howland Island';
+$lang['UM11'] = '(UTC -11:00) Samoa Time Zone, Niue';
+$lang['UM10'] = '(UTC -10:00) Hawaii-Aleutian Standard Time, Cook Islands, Tahiti';
+$lang['UM95'] = '(UTC -9:30) Marquesas Islands';
+$lang['UM9'] = '(UTC -9:00) Alaska Standard Time, Gambier Islands';
+$lang['UM8'] = '(UTC -8:00) Pacific Standard Time, Clipperton Island';
+$lang['UM7'] = '(UTC -7:00) Mountain Standard Time';
+$lang['UM6'] = '(UTC -6:00) Central Standard Time';
+$lang['UM5'] = '(UTC -5:00) Eastern Standard Time, Western Caribbean Standard Time';
+$lang['UM45'] = '(UTC -4:30) Venezuelan Standard Time';
+$lang['UM4'] = '(UTC -4:00) Atlantic Standard Time, Eastern Caribbean Standard Time';
+$lang['UM35'] = '(UTC -3:30) Newfoundland Standard Time';
+$lang['UM3'] = '(UTC -3:00) Argentina, Brazil, French Guiana, Uruguay';
+$lang['UM2'] = '(UTC -2:00) South Georgia/South Sandwich Islands';
+$lang['UM1'] = '(UTC -1:00) Azores, Cape Verde Islands';
+$lang['UTC'] = '(UTC) Greenwich Mean Time, Western European Time';
+$lang['UP1'] = '(UTC +1:00) Central European Time, West Africa Time';
+$lang['UP2'] = '(UTC +2:00) Central Africa Time, Eastern European Time, Kaliningrad Time';
+$lang['UP3'] = '(UTC +3:00) Moscow Time, East Africa Time';
+$lang['UP35'] = '(UTC +3:30) Iran Standard Time';
+$lang['UP4'] = '(UTC +4:00) Azerbaijan Standard Time, Samara Time';
+$lang['UP45'] = '(UTC +4:30) Afghanistan';
+$lang['UP5'] = '(UTC +5:00) Pakistan Standard Time, Yekaterinburg Time';
+$lang['UP55'] = '(UTC +5:30) Indian Standard Time, Sri Lanka Time';
+$lang['UP575'] = '(UTC +5:45) Nepal Time';
+$lang['UP6'] = '(UTC +6:00) Bangladesh Standard Time, Bhutan Time, Omsk Time';
+$lang['UP65'] = '(UTC +6:30) Cocos Islands, Myanmar';
+$lang['UP7'] = '(UTC +7:00) Krasnoyarsk Time, Cambodia, Laos, Thailand, Vietnam';
+$lang['UP8'] = '(UTC +8:00) Australian Western Standard Time, Beijing Time, Irkutsk Time';
+$lang['UP875'] = '(UTC +8:45) Australian Central Western Standard Time';
+$lang['UP9'] = '(UTC +9:00) Japan Standard Time, Korea Standard Time, Yakutsk Time';
+$lang['UP95'] = '(UTC +9:30) Australian Central Standard Time';
+$lang['UP10'] = '(UTC +10:00) Australian Eastern Standard Time, Vladivostok Time';
+$lang['UP105'] = '(UTC +10:30) Lord Howe Island';
+$lang['UP11'] = '(UTC +11:00) Magadan Time, Solomon Islands, Vanuatu';
+$lang['UP115'] = '(UTC +11:30) Norfolk Island';
+$lang['UP12'] = '(UTC +12:00) Fiji, Gilbert Islands, Kamchatka Time, New Zealand Standard Time';
+$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';
diff --git a/system/language/nl-BE/db_lang.php b/system/language/nl-BE/db_lang.php
new file mode 100755
index 000000000..8a6ad0b77
--- /dev/null
+++ b/system/language/nl-BE/db_lang.php
@@ -0,0 +1,25 @@
+<?php
+$lang['db_invalid_connection_str'] = 'Kan de database instellingen niet bepalen aan de hand van de "connection string" die u heeft opgegeven.';
+$lang['db_unable_to_connect'] = 'Kan niet verbinden met de database server met de huidige instellingen die u heeft opgegeven.';
+$lang['db_unable_to_select'] = 'Kan de volgende database niet selecteren: %s';
+$lang['db_unable_to_create'] = 'Kan de volgende database niet cre';
+$lang['db_invalid_query'] = 'De query die u heeft ingegeven is niet correct.';
+$lang['db_must_set_table'] = 'U moet de database tabel vaststellen die uw wilt gebruiken.';
+$lang['db_must_use_set'] = 'U moet de "SET" methode gebruiken om een entry te updaten.';
+$lang['db_must_use_index'] = 'U moet een index opgeven die overeenkomt met de batch updates.';
+$lang['db_batch_missing_index'] = 'Één of meer verstuurde regels voor batch update missen de benodigde index.';
+$lang['db_must_use_where'] = 'Update queries zijn niet toegestaan tenzij ze een "WHERE" clausule bevatten.';
+$lang['db_del_must_use_where'] = 'Delete queries zijn niet toegestaan tenzij ze een "WHERE" clausule bevatten.';
+$lang['db_field_param_missing'] = 'Om velden op te halen moet u de naam van de tabel opgeven.';
+$lang['db_unsupported_function'] = 'Deze functie wordt niet ondersteund door de databaseversie die u gebruikt.';
+$lang['db_transaction_failure'] = 'Transactie mislukt: Rollback uitgevoerd.';
+$lang['db_unable_to_drop'] = 'Kan de opgegeven database niet verwijderen.';
+$lang['db_unsuported_feature'] = 'Niet ondersteunde functie in het gebruikte databaseplatform.';
+$lang['db_unsuported_compression'] = 'Het bestandscompressieformaat dat u heeft gekozen word niet ondersteund door de server.';
+$lang['db_filepath_error'] = 'Niet mogelijk om de data te schrijven naar het bestandspad dat u heeft opgegeven.';
+$lang['db_invalid_cache_path'] = 'Het cache pad wat u heeft opgegeven is niet geldig of niet schrijfbaar.';
+$lang['db_table_name_required'] = 'Een tabel naam is nodig voor die handeling.';
+$lang['db_column_name_required'] = 'Een kolom naam is nodig voor die handeling.';
+$lang['db_column_definition_required'] = 'Een kolom definitie is nodig voor die handeling.';
+$lang['db_unable_to_set_charset'] = 'Kan de volgende karakterset niet instellen voor de connectie: %s';
+$lang['db_error_heading'] = 'Er is een database fout opgetreden.';
diff --git a/system/language/nl-BE/email_lang.php b/system/language/nl-BE/email_lang.php
new file mode 100755
index 000000000..0f80634a1
--- /dev/null
+++ b/system/language/nl-BE/email_lang.php
@@ -0,0 +1,19 @@
+<?php
+$lang['email_must_be_array'] = 'De email validatie methode moet een array als argument krijgen.';
+$lang['email_invalid_address'] = 'Ongeldig e-mailadres: %s';
+$lang['email_attachment_missing'] = 'De volgende bijlage kon niet worden gevonden: %s';
+$lang['email_attachment_unreadable'] = 'Kan deze bijlage niet openen: %s';
+$lang['email_no_recipients'] = 'U moet ontvangers specificeren in: To, Cc, of Bcc';
+$lang['email_send_failure_phpmail'] = 'Kan geen email verzenden met PHP mail(). Uw server is vermoedelijk niet ingesteld om deze methode te kunnen gebruiken.';
+$lang['email_send_failure_sendmail'] = 'Kan geen email verzenden met PHP sendmail(). Uw server is vermoedelijk niet ingesteld om deze methode te kunnen gebruiken.';
+$lang['email_send_failure_smtp'] = 'Kan geen email verzenden met PHP SMTP. Uw server is vermoedelijk niet ingesteld om deze methode te kunnen gebruiken.';
+$lang['email_sent'] = 'Uw bericht is succesvol verstuurd met behulp van het protocol: %s';
+$lang['email_no_socket'] = 'Kon geen socket openen voor Sendmail. Kijkt u alstublieft uw instellingen na.';
+$lang['email_no_hostname'] = 'U heeft geen SMTP hostnaam opgegeven.';
+$lang['email_smtp_error'] = 'De volgende SMTP fout is opgetreden: %s';
+$lang['email_no_smtp_unpw'] = 'U moet een SMTP gebruikersnaam en wachtwoord opgeven.';
+$lang['email_failed_smtp_login'] = 'Het versturen van het AUTH LOGIN commando is mislukt. Foutmelding: %s';
+$lang['email_smtp_auth_un'] = 'Gebruikersnaam niet gevonden. Foutmelding: %s';
+$lang['email_smtp_auth_pw'] = 'Wachtwoord niet gevonden. Foutmelding: %s';
+$lang['email_smtp_data_failure'] = 'Kon data niet versturen: %s';
+$lang['email_exit_status'] = 'Afsluit status code: %s';
diff --git a/system/language/nl-BE/form_validation_lang.php b/system/language/nl-BE/form_validation_lang.php
new file mode 100755
index 000000000..abb917fd9
--- /dev/null
+++ b/system/language/nl-BE/form_validation_lang.php
@@ -0,0 +1,19 @@
+<?php
+$lang['required'] = 'Het "%s" veld mag niet leeg zijn.';
+$lang['isset'] = 'Het "%s" veld moet een waarde hebben.';
+$lang['valid_email'] = 'Het "%s" veld moet een geldig e-mail adres bevatten.';
+$lang['valid_emails'] = 'Het "%s" veld moet geldige e-mail adressen bevatten.';
+$lang['valid_url'] = 'Het "%s" veld moet een correcte URL bevatten.';
+$lang['valid_ip'] = 'Het "%s" veld moet een correct IP adres bevatten.';
+$lang['min_length'] = 'Het "%s" veld moet tenminste %s tekens bevatten.';
+$lang['max_length'] = 'Het "%s" veld mag niet meer dan %s tekens bevatten.';
+$lang['exact_length'] = 'Het "%s" veld moet precies %s tekens bevatten.';
+$lang['alpha'] = 'Het "%s" veld mag alleen letters bevatten.';
+$lang['alpha_numeric'] = 'Het "%s" veld mag alleen letters en cijfers bevatten.';
+$lang['alpha_dash'] = 'Het "%s" veld mag alleen letters, cijfers, underscores(_) en strepen(-) bevatten.';
+$lang['numeric'] = 'Het "%s" veld mag alleen een getal bevatten.';
+$lang['is_numeric'] = 'Het "%s" veld mag alleen een getal bevatten.';
+$lang['integer'] = 'Het "%s" veld moet een geheel getal bevatten.';
+$lang['matches'] = 'De waarde van het "%s" veld is niet gelijk aan de waarde van het "%s" veld.';
+$lang['is_natural'] = 'Het "%s" veld mag alleen een getal bevatten dat niet kleiner is dan nul.';
+$lang['is_natural_no_zero'] = 'Het "%s" veld moet een getal bevatten dat groter is dan nul.';
diff --git a/system/language/nl-BE/ftp_lang.php b/system/language/nl-BE/ftp_lang.php
new file mode 100755
index 000000000..31d0eb88e
--- /dev/null
+++ b/system/language/nl-BE/ftp_lang.php
@@ -0,0 +1,13 @@
+<?php
+$lang['ftp_no_connection'] = 'Kan geen geldig connectie ID vinden.  Zorg dat je verbonden bent voordat je bestandshandelingen gaat uitvoeren.';
+$lang['ftp_unable_to_connect'] = 'Kan geen verbinding maken met de FTP server op de opgegeven hostname.';
+$lang['ftp_unable_to_login'] = 'Aanmelden op de FTP server is mislukt.  Controleer de gebruikersnaam en het wachtwoord.';
+$lang['ftp_unable_to_makdir'] = 'Kan de opgegeven map niet cre';
+$lang['ftp_unable_to_changedir'] = 'Kan niet van pad veranderen.';
+$lang['ftp_unable_to_chmod'] = 'Kan de bestandspermissies niet instellen.  Controleer het pad.  Opmerking: Deze functionaliteit is enkel beschikbaar in PHP 5 en hoger.';
+$lang['ftp_unable_to_upload'] = 'Kan het opgegeven bestand niet uploaden. Controleer het pad.';
+$lang['ftp_unable_to_download'] = 'Kan het opgegeven bestand niet downloaden. Controleer het pad.';
+$lang['ftp_no_source_file'] = 'Kan het bronbestand niet vinden.  Controleer het pad.';
+$lang['ftp_unable_to_rename'] = 'Kan de naam van het bestand niet wijzigen.';
+$lang['ftp_unable_to_delete'] = 'Kan het bestand niet verwijderen.';
+$lang['ftp_unable_to_move'] = 'Kan het bestand niet verplaatsen.  Controleer of het doelpad wel bestaat.';
diff --git a/system/language/nl-BE/imglib_lang.php b/system/language/nl-BE/imglib_lang.php
new file mode 100755
index 000000000..d6f869421
--- /dev/null
+++ b/system/language/nl-BE/imglib_lang.php
@@ -0,0 +1,19 @@
+<?php
+$lang['imglib_source_image_required'] = 'U moet een bron bestand opgeven in uw instellingen.';
+$lang['imglib_gd_required'] = 'De GD image library is benodigd voor deze functie.';
+$lang['imglib_gd_required_for_props'] = 'Uw server moet de GD library ondersteunen om de eigenschappen van de afbeelding te kunnen bepalen.';
+$lang['imglib_unsupported_imagecreate'] = 'Uw server ondersteunt de benodigde GD functie voor dit type afbeelding niet.';
+$lang['imglib_gif_not_supported'] = 'GIF afbeeldingen worden vaak niet ondersteund door licentie beperkingen.  U zou JPG of PNG afbeeldingen kunnen proberen.';
+$lang['imglib_jpg_not_supported'] = 'JPG afbeeldingen worden niet ondersteund.';
+$lang['imglib_png_not_supported'] = 'PNG afbeeldingen worden niet ondersteund.';
+$lang['imglib_jpg_or_png_required'] = 'Het veranderen van de grootte van afbeeldingen werkt alleen voor JPEG of PNG afbeeldingen.';
+$lang['imglib_copy_error'] = 'Er is een fout opgetreden bij het vervangen van de afbeelding.  Zorg ervoor dat het pad schrijfbaar is.';
+$lang['imglib_rotate_unsupported'] = 'Afbeeldingen roteren met behulp van PHP wordt niet ondersteund op uw server.';
+$lang['imglib_libpath_invalid'] = 'Het pad dat u heeft opgegeven van de image library is niet correct.  Verander dit in uw instellingen van de afbeelding.';
+$lang['imglib_image_process_failed'] = 'Afbeeldingsverwerking mislukt.  Gaat na of het pad naar uw image libray correct is ingesteld en of uw server het gekozen protocol ondersteunt.';
+$lang['imglib_rotation_angle_required'] = 'Een draaihoek moet worden opgegeven om een afbeelding te kunnen roteren.';
+$lang['imglib_writing_failed_gif'] = 'GIF afbeelding ';
+$lang['imglib_invalid_path'] = 'Het opgegeven pad van het afbeelding is niet correct.';
+$lang['imglib_copy_failed'] = 'De afbeeldings kopi';
+$lang['imglib_missing_font'] = 'Kon geen lettertype vinden om te gebruiken.';
+$lang['imglib_save_failed'] = 'Kon e afbeelding niet opslaan. Zorg ervoor dat het pad en de afbeelding (over)schrijfbaar zijn.';
diff --git a/application/language/english/index.html b/system/language/nl-BE/index.html
old mode 100644
new mode 100755
similarity index 86%
rename from application/language/english/index.html
rename to system/language/nl-BE/index.html
index 0696be4eb..c942a79ce
--- a/application/language/english/index.html
+++ b/system/language/nl-BE/index.html
@@ -1,10 +1,10 @@
-<html>
-<head>
-	<title>403 Forbidden</title>
-</head>
-<body>
-
-<p>Directory access is forbidden.</p>
-
-</body>
-</html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/system/language/nl-BE/migration_lang.php b/system/language/nl-BE/migration_lang.php
new file mode 100644
index 000000000..4763ca243
--- /dev/null
+++ b/system/language/nl-BE/migration_lang.php
@@ -0,0 +1,13 @@
+<?php
+
+$lang['migration_none_found']			= "No migrations were found.";
+$lang['migration_not_found']			= "This migration could not be found.";
+$lang['migration_multiple_version']		= "This are multiple migrations with the same version number: %d.";
+$lang['migration_class_doesnt_exist']	= "The migration class \"%s\" could not be found.";
+$lang['migration_missing_up_method']	= "The migration class \"%s\" is missing an 'up' method.";
+$lang['migration_missing_down_method']	= "The migration class \"%s\" is missing an 'up' method.";
+$lang['migration_invalid_filename']		= "Migration \"%s\" has an invalid filename.";
+
+
+/* End of file migration_lang.php */
+/* Location: ./system/language/english/migration_lang.php */
\ No newline at end of file
diff --git a/system/language/nl-BE/number_lang.php b/system/language/nl-BE/number_lang.php
new file mode 100755
index 000000000..e65024b0e
--- /dev/null
+++ b/system/language/nl-BE/number_lang.php
@@ -0,0 +1,6 @@
+<?php
+$lang['terabyte_abbr'] = 'TB';
+$lang['gigabyte_abbr'] = 'GB';
+$lang['megabyte_abbr'] = 'MB';
+$lang['kilobyte_abbr'] = 'KB';
+$lang['bytes'] = 'Bytes';
diff --git a/system/language/nl-BE/profiler_lang.php b/system/language/nl-BE/profiler_lang.php
new file mode 100755
index 000000000..94b94b827
--- /dev/null
+++ b/system/language/nl-BE/profiler_lang.php
@@ -0,0 +1,18 @@
+<?php
+$lang['profiler_database'] = 'DATABASE';
+$lang['profiler_controller_info'] = 'CLASS/METHOD';
+$lang['profiler_benchmarks'] = 'BENCHMARKS';
+$lang['profiler_queries'] = 'QUERIES';
+$lang['profiler_get_data'] = 'GET DATA';
+$lang['profiler_post_data'] = 'POST DATA';
+$lang['profiler_uri_string'] = 'URI STRING';
+$lang['profiler_memory_usage'] = 'GEHEUGEN GEBRUIK';
+$lang['profiler_config'] = 'CONFIG VARIABELEN';
+$lang['profiler_headers'] = 'HTTP HEADERS';
+$lang['profiler_no_db'] = 'Database driver is momenteel niet geladen';
+$lang['profiler_no_queries'] = 'Er zijn geen queries uitgevoerd';
+$lang['profiler_no_post'] = 'Er is geen POST data';
+$lang['profiler_no_get'] = 'Er is geen GET data';
+$lang['profiler_no_uri'] = 'Er is geen URI data';
+$lang['profiler_no_memory'] = 'Geheugen gebruik niet beschikbaar';
+$lang['profiler_no_profiles'] = 'Geen Profile gegevens - alle Profile onderdelen zijn uitgeschakeld';
diff --git a/system/language/nl-BE/unit_test_lang.php b/system/language/nl-BE/unit_test_lang.php
new file mode 100755
index 000000000..b05463ffb
--- /dev/null
+++ b/system/language/nl-BE/unit_test_lang.php
@@ -0,0 +1,20 @@
+<?php
+$lang['ut_test_name'] = 'Test Naam';
+$lang['ut_test_datatype'] = 'Test Datatype ';
+$lang['ut_res_datatype'] = 'Verwachte Datatype';
+$lang['ut_result'] = 'Resultaat';
+$lang['ut_undefined'] = 'Ongedefinieerde Test Naam';
+$lang['ut_file'] = 'Bestandsnaam';
+$lang['ut_line'] = 'Regelnummer';
+$lang['ut_passed'] = 'Succesvol';
+$lang['ut_failed'] = 'Mislukt';
+$lang['ut_boolean'] = 'Boolean';
+$lang['ut_integer'] = 'Integer';
+$lang['ut_float'] = 'Float';
+$lang['ut_double'] = 'Double';
+$lang['ut_string'] = 'String';
+$lang['ut_array'] = 'Array';
+$lang['ut_object'] = 'Object';
+$lang['ut_resource'] = 'Resource';
+$lang['ut_null'] = 'Null';
+$lang['ut_notes'] = 'Notities';
diff --git a/system/language/nl-BE/upload_lang.php b/system/language/nl-BE/upload_lang.php
new file mode 100755
index 000000000..d94b730f4
--- /dev/null
+++ b/system/language/nl-BE/upload_lang.php
@@ -0,0 +1,17 @@
+<?php
+$lang['upload_userfile_not_set'] = 'Kon de POST variabele "userfile" niet vinden.';
+$lang['upload_file_exceeds_limit'] = 'Het geuploade bestand overschrijdt de maximum grootte. Deze maximum grootte is gespecificeerd in uw PHP configuratie bestand.';
+$lang['upload_file_exceeds_form_limit'] = 'Het geuploade bestand overschrijdt de maximum grootte die in het formulier is aangegeven';
+$lang['upload_file_partial'] = 'Het bestand is maar gedeeltelijk geupload.';
+$lang['upload_no_temp_directory'] = 'De tijdelijke map bestaat niet.';
+$lang['upload_unable_to_write_file'] = 'Het bestand kon niet naar de schijf geschreven worden.';
+$lang['upload_stopped_by_extension'] = 'Het uploaden is gestopt door uitbreiding.';
+$lang['upload_no_file_selected'] = 'U heeft geen bestand geselecteerd om te uploaden.';
+$lang['upload_invalid_filetype'] = 'Het bestandstype van het bestand dat u probeert te uploaden is niet toegestaan.';
+$lang['upload_invalid_filesize'] = 'De bestandsgrootte van het bestand dat u probeert te uploaden is te groot.';
+$lang['upload_invalid_dimensions'] = 'De afbeelding die u probeert te uploaden is breder of hoger dan toegestaan.';
+$lang['upload_destination_error'] = 'Er is een probleem opgetreden bij het verplaatsen van het bestand naar de doellocatie.';
+$lang['upload_no_filepath'] = 'Het uploadpad is niet correct.';
+$lang['upload_no_file_types'] = 'U heeft geen toegestane bestandstypen gespecificeerd.';
+$lang['upload_bad_filename'] = 'De bestandsnaam die u heeft opgegeven komt al voor op de server.';
+$lang['upload_not_writable'] = 'De doellocatie op de server is niet schijfbaar';
diff --git a/system/language/nl-BE/validation_lang.php b/system/language/nl-BE/validation_lang.php
new file mode 100755
index 000000000..92249ec1e
--- /dev/null
+++ b/system/language/nl-BE/validation_lang.php
@@ -0,0 +1,16 @@
+<?php
+$lang['required'] = 'Het "%s" veld moet verplicht worden ingevuld.';
+$lang['isset'] = 'Het "%s" veld moet een waarde hebben.';
+$lang['valid_email'] = 'Het "%s" veld moet een geldig emailadres bevatten.';
+$lang['valid_emails'] = 'Het "%s" veld moet geldige emailadressen bevatten.';
+$lang['valid_url'] = 'Het "%s" veld moet een correcte URL bevatten.';
+$lang['valid_ip'] = 'Het "%s" veld moet een correct IP adres bevatten.';
+$lang['min_length'] = 'Het "%s" veld moet tenminste %s tekens bevatten.';
+$lang['max_length'] = 'Het "%s" veld mag niet meer dan %s tekens bevatten.';
+$lang['exact_length'] = 'Het "%s" veld moet exact %s tekens bevatten.';
+$lang['alpha'] = 'Het "%s" veld mag alleen letters bevatten.';
+$lang['alpha_numeric'] = 'Het "%s" veld mag alleen letters en cijfers bevatten.';
+$lang['alpha_dash'] = 'Het "%s" veld mag alleen letters, cijfers, underscores(_) en strepen(-) bevatten.';
+$lang['numeric'] = 'Het "%s" veld mag alleen nummers bevatten.';
+$lang['integer'] = 'Het "%s" veld moet een heel getal bevatten.';
+$lang['matches'] = 'De waarde van het "%s" veld is niet gelijk aan de waarde van het "%s" veld.';