diff --git a/application/config/autoload.php b/application/config/autoload.php
index cb62d45fa..fe5907cb9 100644
--- a/application/config/autoload.php
+++ b/application/config/autoload.php
@@ -64,7 +64,7 @@ $autoload['libraries'] = array('database','form_validation','session','user_agen
 |	$autoload['helper'] = array('url', 'file');
 */
 
-$autoload['helper'] = array('form','url','table','text','currency', 'html', 'download');
+$autoload['helper'] = array('form','url','table','text','currency', 'html', 'download', 'directory');
 
 
 /*
@@ -96,7 +96,7 @@ $autoload['config'] = array();
 |
 */
 
-$autoload['language'] = array('common', 'config', 'customers', 'employees', 'error', 'items', 'login', 'module', 'reports', 'sales','suppliers','receivings','giftcards', 'item_kits');
+$autoload['language'] = array();
 
 
 /*
diff --git a/application/controllers/items.php b/application/controllers/items.php
index b04a9bd37..ad91bb66d 100644
--- a/application/controllers/items.php
+++ b/application/controllers/items.php
@@ -28,15 +28,17 @@ class Items extends Secure_area implements iData_controller
 		$is_serialized=$this->input->post('is_serialized');
 		$no_description=$this->input->post('no_description');
 		$search_custom=$this->input->post('search_custom');//GARRISON ADDED 4/13/2013
+		$is_deleted=$this->input->post('is_deleted'); // Parq 131215
 
 		$data['search_section_state']=$this->input->post('search_section_state');
 		$data['low_inventory']=$this->input->post('low_inventory');
 		$data['is_serialized']=$this->input->post('is_serialized');
 		$data['no_description']=$this->input->post('no_description');
 		$data['search_custom']=$this->input->post('search_custom');//GARRISON ADDED 4/13/2013
+		$data['is_deleted']=$this->input->post('is_deleted'); // Parq 131215
 		$data['controller_name']=strtolower(get_class());
 		$data['form_width']=$this->get_form_width(); 
-		$data['manage_table']=get_items_manage_table($this->Item->get_all_filtered($low_inventory,$is_serialized,$no_description,$search_custom),$this);//GARRISON MODIFIED 4/13/2013
+		$data['manage_table']=get_items_manage_table($this->Item->get_all_filtered($low_inventory,$is_serialized,$no_description,$search_custom,$is_deleted),$this);//GARRISON MODIFIED 4/13/2013, Parq 131215
 		$this->load->view('items/manage',$data);
 	}
 
@@ -240,7 +242,7 @@ class Items extends Secure_area implements iData_controller
 			$suppliers[$row['person_id']] = $row['first_name'] .' '. $row['last_name'];
 		}
 		$data['suppliers'] = $suppliers;
-		$data['allow_alt_desciption_choices'] = array(
+		$data['allow_alt_description_choices'] = array(
 			''=>$this->lang->line('items_do_nothing'), 
 			1 =>$this->lang->line('items_change_all_to_allow_alt_desc'),
 			0 =>$this->lang->line('items_change_all_to_not_allow_allow_desc'));
@@ -267,6 +269,7 @@ class Items extends Secure_area implements iData_controller
 		'location'=>$this->input->post('location'),
 		'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/helpers/table_helper.php b/application/helpers/table_helper.php
index 9f5927a11..ce162fd29 100644
--- a/application/helpers/table_helper.php
+++ b/application/helpers/table_helper.php
@@ -40,7 +40,7 @@ function get_people_manage_table_data_rows($people,$controller)
 	
 	if($people->num_rows()==0)
 	{
-		$table_data_rows.="<tr><td colspan='6'><div class='warning_message' style='padding:7px;'>".$CI->lang->line('common_no_persons_to_display')."</div></tr></tr>";
+		$table_data_rows.="<tr><td colspan='6'><div class='warning_message' style='padding:7px;'>".$CI->lang->line('common_no_persons_to_display')."</div></td></tr>";
 	}
 	
 	return $table_data_rows;
diff --git a/application/hooks/load_config.php b/application/hooks/load_config.php
index 7f24ea02c..d1f969771 100644
--- a/application/hooks/load_config.php
+++ b/application/hooks/load_config.php
@@ -2,31 +2,38 @@
 //Loads configuration from database into global CI config
 function load_config()
 {
-	$CI =& get_instance();
-	foreach( $CI->Appconfig->get_all()->result() as $app_config )
-	{
-		$CI->config->set_item( $app_config->key, $app_config->value );
-	}
-	
-	if ( $CI->config->item( 'language' ) )
-	{
-		$CI->config->set_item( 'language', $CI->config->item( 'language' ) );
-    $loaded = $CI->lang->is_loaded;
-    $CI->lang->is_loaded = array();
-
-    foreach($loaded as $file)
+    $CI =& get_instance();
+    foreach( $CI->Appconfig->get_all()->result() as $app_config )
     {
-        $CI->lang->load( str_replace( '_lang.php', '', $file ) );    
+        $CI->config->set_item( $app_config->key, $app_config->value );
+    }
+    
+    //Set language from config database
+    //Loads all the language files from the language directory
+    
+    if ( $CI->config->item( 'language' ) )
+    {
+        $CI->config->set_item( 'language', $CI->config->item( 'language' ) );
+        
+        $map = directory_map('./application/language/' . $CI->config->item( 'language' ));
+
+        foreach($map as $file)
+        {
+            if ( substr(strrchr($file,'.'),1) == "php")
+            {
+                $CI->lang->load( str_replace( '_lang.php', '', $file ) );    
+            }
+        }
+    }
+    
+    //Set timezone from config database
+    if ( $CI->config->item( 'timezone' ) )
+    {
+        date_default_timezone_set( $CI->config->item( 'timezone' ) );
+    }
+    else
+    {
+        date_default_timezone_set( 'America/New_York' );
     }
-	}
-	
-	if ( $CI->config->item( 'timezone' ) )
-	{
-		date_default_timezone_set( $CI->config->item( 'timezone' ) );
-	}
-	else
-	{
-		date_default_timezone_set( 'America/New_York' );
-	}
 }
 ?>
\ No newline at end of file
diff --git a/application/language/BahasaIndonesia/common_lang.php b/application/language/BahasaIndonesia/common_lang.php
deleted file mode 100644
index 53e4e9c6d..000000000
--- a/application/language/BahasaIndonesia/common_lang.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-$lang['common_common']='biasa';
-$lang['common_submit']='Kirim';
-$lang['common_or']='ATAU';
-$lang['common_powered_by']='Disponsori oleh';
-$lang['common_welcome']='Selamat Datang';
-$lang['common_logout']='Logout';
-$lang['common_list_of']='Daftar';
-$lang['common_first_name']='Nama Pertama';
-$lang['common_last_name']='Nama Belakang';
-$lang['common_email']='E-Mail';
-$lang['common_phone_number']='Telepon';
-$lang['common_address_1']='Alamat 1';
-$lang['common_address_2']='Alamat 2';
-$lang['common_city']='Kota';
-$lang['common_state']='Provinsi';
-$lang['common_state']='Provinsi';
-$lang['common_zip']='KODEPOS';
-$lang['common_country']='Negara';
-$lang['common_comments']='Catatan';
-$lang['common_edit']='ubah';
-$lang['common_search']='Cari';
-$lang['common_delete']='Hapus';
-$lang['common_view_recent_sales']='Lihat Penjualan Terkini';
-$lang['common_you_are_using_ospos']='Anda menggunakan Open Source Point Of Sale Versi';
-$lang['common_please_visit_my']='SIlakan kunjungi';
-$lang['common_website']='situs';
-$lang['common_fields_required_message']='bagian yang ditandai merah wajib diisi';
-$lang['common_learn_about_project']='untuk belajar informasi terbaru tentang proyek ini';
-$lang['common_searched_for']='Mencari untuk';
-$lang['common_first_name_required']='Nama pertama wajib diisi.';
-$lang['common_last_name_required']='Nama belakang wajib diisi.';
-$lang['common_email_invalid_format']='Format alamat e-mail tidak benar';
-$lang['common_confirm_search']='Anda telah memilih satu atau lebih baris, ini tidak akan lagi dipilih setelah pencarian Anda. Apakah Anda yakin ingin mengirimkan pencarian ini?';
-$lang['common_no_persons_to_display']='Tidak ada orang untuk ditampilkan';
-$lang['common_return_policy']='Kebijakan Retur';
-$lang['common_price']='Harga';
-$lang['common_welcome_message']= 'Selamat Datang di Open Source Point Of Sale, klik modul di bawah ini untuk memulai!';
-$lang['common_inv']='inv';
-$lang['common_det']='details';
-?>
diff --git a/application/language/BahasaIndonesia/config_lang.php b/application/language/BahasaIndonesia/config_lang.php
deleted file mode 100644
index b28d95ff8..000000000
--- a/application/language/BahasaIndonesia/config_lang.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-$lang['config_info']='Informasi Konfigurasi Toko';
-$lang['config_company']='Nama Perusahaan';
-$lang['config_address']='Alamat Perusahaan';
-$lang['config_phone']='Telepon Perusahaan';
-$lang['config_website']='Situs Perusahaan';
-$lang['config_fax']='Fax';
-$lang['config_default_tax_rate']='Tarif Pajak Biasa%';
-$lang['config_default_tax_rate_1']='Tarif Pajak 1';
-$lang['config_default_tax_rate_2']='Tarif Pajak 2';
-$lang['config_company_required']='Nama Perusahaan wajib diisi';
-$lang['config_address_required']='Alamat Perusahaan wajib diisi';
-$lang['config_phone_required']='Telepon Perusahaan wajib diisi';
-$lang['config_default_tax_rate_required']='Tarif Pajak Biasa wajib diisi';
-$lang['config_default_tax_rate_number']='Tarif Pajak Biasa harus angka';
-$lang['config_company_website_url']='Situs Perusahaan bukan URL yang benar(http://...)';
-$lang['config_saved_successfully']='Konfigurasi berhasil disimpan';
-$lang['config_saved_unsuccessfully']='Konfigurasi tidak berhasil disimpan';
-$lang['config_return_policy_required']='Kebiajak retur wajib diisi';
-$lang['config_print_after_sale']='Cetak bon setelah penjualan';
-$lang['config_language'] = 'Language';
-$lang['config_timezone'] = 'Timezone';
-$lang['config_currency_symbol'] = 'Currency Symbol';
-?>
\ No newline at end of file
diff --git a/application/language/BahasaIndonesia/customers_lang.php b/application/language/BahasaIndonesia/customers_lang.php
deleted file mode 100644
index 4ce03c357..000000000
--- a/application/language/BahasaIndonesia/customers_lang.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-$lang['customers_new']='Pelanggan Baru';
-$lang['customers_customer']='Pelanggan';
-$lang['customers_update']='Ubah Pelanggan';
-$lang['customers_confirm_delete']='Apakah Anda yakin ingin menghapus pelanggan yang dipilih?';
-$lang['customers_none_selected']='Anda belum memilih pelanggan untuk dihapus';
-$lang['customers_error_adding_updating'] = 'Error menambah / memperbarui pelanggan';
-$lang['customers_successful_adding']='Anda telah berhasil menambah pelanggan';
-$lang['customers_successful_updating']='Anda telah berhasil memperbarui pelanggan';
-$lang['customers_successful_deleted']='Anda telah berhasil menghapus';
-$lang['customers_one_or_multiple']='pelanggan';
-$lang['customers_cannot_be_deleted']='pelanggan terpilih tidak bisa dihapus; satu atau lebih dari pelanggan yang dipilih memiliki penjualan.';
-$lang['customers_basic_information']='Informasi Pelanggan';
-$lang['customers_account_number']='Nomor Akun';
-$lang['customers_taxable']='Dapat dikenakan pajak';
-?>
\ No newline at end of file
diff --git a/application/language/BahasaIndonesia/employees_lang.php b/application/language/BahasaIndonesia/employees_lang.php
deleted file mode 100644
index 5f2fc811e..000000000
--- a/application/language/BahasaIndonesia/employees_lang.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-$lang['employees_employee']='Karyawan';
-$lang['employees_new']='Karyawan Baru';
-$lang['employees_update']='Ubah Karyawan';
-$lang['employees_confirm_delete']='Apakah Anda yakin ingin menghapus karyawan yang dipilih?';
-$lang['employees_none_selected']='Anda belum memilih karyawan untuk menghapus';
-$lang['employees_error_adding_updating'] = 'Error menambah / memperbarui karyawan';
-$lang['employees_successful_adding']='Anda telah berhasil menambahkan karyawan';
-$lang['employees_successful_updating']='Anda telah berhasil memperbarui karyawan';
-$lang['employees_successful_deleted']='Anda telah berhasil menghapus';
-$lang['employees_one_or_multiple']='karyawan';
-$lang['employees_cannot_be_deleted']='karyawan terpilih tidak bisa dihapus; satu atau lebih dari para pekerja telah memproses penjualan atau Anda mencoba untuk menghapus diri Anda sendiri:)';
-$lang['employees_username']='Username';
-$lang['employees_password']='Password';
-$lang['employees_repeat_password']='Password Lagi';
-$lang['employees_username_required']='Username wajib diisi';
-$lang['employees_username_minlength']='Username minimal 5 huruf';
-$lang['employees_password_required']='Password wajib diisi';
-$lang['employees_password_minlength']='Passwords minimal 8 huruf/angka';
-$lang['employees_password_must_match']='Passwords tidak cocok';
-$lang['employees_basic_information']='Informasi Karyawan';
-$lang['employees_login_info']='Info Login Karyawan';
-$lang['employees_permission_info']='Hak Akses Karyawan';
-$lang['employees_permission_desc']='Tandai kotak di bawah ini untuk memberikan akses ke modul';
-$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';
-?>
\ No newline at end of file
diff --git a/application/language/BahasaIndonesia/error_lang.php b/application/language/BahasaIndonesia/error_lang.php
deleted file mode 100644
index 5fb55ba97..000000000
--- a/application/language/BahasaIndonesia/error_lang.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$lang['error_no_permission_module']='Anda tidak memiliki izin untuk mengakses modul ini';
-$lang['error_unknown']='tidak dikenal';
-?>
\ No newline at end of file
diff --git a/application/language/BahasaIndonesia/giftcards_lang.php b/application/language/BahasaIndonesia/giftcards_lang.php
deleted file mode 100644
index c6ba2ebe1..000000000
--- a/application/language/BahasaIndonesia/giftcards_lang.php
+++ /dev/null
@@ -1,71 +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_retrive_giftcard_info']='Retrive 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_reorder_level']='Reorder Level';
-$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_desciption'] = '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/BahasaIndonesia/items_lang.php b/application/language/BahasaIndonesia/items_lang.php
deleted file mode 100644
index 2cc620e96..000000000
--- a/application/language/BahasaIndonesia/items_lang.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-$lang['items_item_number']='UPC/EAN/ISBN';
-$lang['items_retrive_item_info']='Dapatkan Info Produk/Item';
-$lang['items_description']='Deskripsi';
-$lang['items_amazon']='Amazon';
-$lang['items_upc_database']='Database UPC';
-$lang['items_cannot_find_item']='Tidak dapat menemukan informasi apapun tentang item';
-$lang['items_info_provided_by']='Info disediakan oleh';
-$lang['items_basic_information']='Informasi Item';
-$lang['items_number_information']='Nomor Item';
-$lang['items_new']='Item Baru';
-$lang['items_update']='Ubah Item';
-$lang['items_item']='Item';
-$lang['items_edit_multiple_items']='Ubah Beberapa Item';
-$lang['items_name']='Nama Item';
-$lang['items_category']='Kategori';
-$lang['items_cost_price']='Biaya Item';
-$lang['items_unit_price']='Harga Satuan';
-$lang['items_tax_1']='Pajak 1';
-$lang['items_tax_2']='Pajak 2';
-$lang['items_sales_tax_1'] = 'Pajak Penjualan';
-$lang['items_sales_tax_2'] = 'Pajak Penjualan2';
-$lang['items_tax_percent']='Tarif Pajak';
-$lang['items_tax_percents']='Tarif Pajak';
-$lang['items_reorder_level']='Batas pesan ulang';
-$lang['items_quantity']='Jumlah';
-$lang['items_reorder_level']='Batas pesan ulang';
-$lang['items_no_items_to_display']='Tidak ada item untuk ditampilkan';
-$lang['items_bulk_edit']='Ubah Massal';
-$lang['items_confirm_delete']='Apakah Anda yakin ingin menghapus item yang dipilih?';
-$lang['items_none_selected']='Anda belum memilih item untuk diubah';
-$lang['items_confirm_bulk_edit']='Apakah Anda yakin ingin mengubah semua item yang dipilih?';
-$lang['items_successful_bulk_edit']='Anda telah berhasil memperbarui item yang dipilih';
-$lang['items_error_updating_multiple']='Error ketika memperbaharui item';
-$lang['items_edit_fields_you_want_to_update']='Ubah bagian yang ingin Anda edit untuk SEMUA item yang dipilih';
-$lang['items_error_adding_updating'] = 'Error ketika menambahkan/memperbaharui item';
-$lang['items_successful_adding']='Anda telah berhasil menambahkan item';
-$lang['items_successful_updating']='Anda telah berhasil memperbarui item';
-$lang['items_successful_deleted']='Anda telah berhasil menghapus';
-$lang['items_one_or_multiple']='item';
-$lang['items_cannot_be_deleted']='Tidak dapat menghapus item terpilih, satu atau lebih item yang dipilih memiliki penjualan.';
-$lang['items_name_required']='Nama item wajib diisi';
-$lang['items_category_required']='Kategori wajib diisi';
-$lang['items_buy_price_required']='Harga Beli wajib diisi';
-$lang['items_unit_price_required']='Harga Jual wajib diisi';
-$lang['items_cost_price_required']='Biaya Item wajib diisi';
-$lang['items_tax_percent_required']='Tarif Pajak wajib diisi';
-$lang['items_quantity_required']='Jumlah wajib diisi';
-$lang['items_reorder_level_required']='Batas pesan ulang wajib diisi';
-$lang['items_unit_price_number']='Harga satuan harus angka';
-$lang['items_cost_price_number']='Biaya Item harus angka';
-$lang['items_quantity_number']='Jumlah harus angka';
-$lang['items_reorder_level_number']='Batas pesan ulang harus angka';
-$lang['items_none'] = 'Kosong';
-$lang['items_supplier'] = 'Pemasok';
-$lang['items_generate_barcodes'] = 'Hasilkan Barcode';
-$lang['items_must_select_item_for_barcode'] = 'Anda harus memilih setidaknya 1 item untuk menghasilkan barcode';
-$lang['items_excel_import_failed'] = 'Excel import failed';
-$lang['items_allow_alt_desciption'] = 'Allow Alternate 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_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_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';
-?>
diff --git a/application/language/BahasaIndonesia/login_lang.php b/application/language/BahasaIndonesia/login_lang.php
deleted file mode 100644
index 7b0150f00..000000000
--- a/application/language/BahasaIndonesia/login_lang.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$lang['login_login']='Masuk';
-$lang['login_username']='Nama pengguna';
-$lang['login_password']='Kata kunci';
-$lang['login_go']='Lanjutkan';
-$lang['login_invalid_username_and_password']='nama pengguna/kata kunci salah';
-$lang['login_welcome_message']='Selamat datang di Open Source Point of Sale System. Untuk melanjutkan, silakan login menggunakan form nama pengguna dan kata kunci di bawah ini.';
-?>
diff --git a/application/language/BahasaIndonesia/module_lang.php b/application/language/BahasaIndonesia/module_lang.php
deleted file mode 100644
index b45605a1f..000000000
--- a/application/language/BahasaIndonesia/module_lang.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-$lang['module_home']='Beranda';
-
-$lang['module_customers']='Pelanggan';
-$lang['module_customers_desc']='Tambah, Update, Hapus, dan Cari pelanggan ';
-
-$lang['module_suppliers']='Pemasok';
-$lang['module_suppliers_desc']='Tambah, Update, Hapus, dan Cari pemasok';
-
-$lang['module_employees']='Karyawan';
-$lang['module_employees_desc']='Tambah, Update, Hapus, dan Cari karyawan';
-
-$lang['module_sales']='Penjualan';
-$lang['module_sales_desc']='Proses penjualan dan retur';
-
-$lang['module_reports']='Laporan';
-$lang['module_reports_desc']='Lihat dan Hasilkan laporan';
-
-$lang['module_items']='Produk/Item';
-$lang['module_items_desc']='Tambah, Update, Hapus, dan Cari produk/items';
-
-$lang['module_config']='Konfigurasi Toko';
-$lang['module_config_desc']='Ubah konfigurasi toko';
-
-$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/BahasaIndonesia/receivings_lang.php b/application/language/BahasaIndonesia/receivings_lang.php
deleted file mode 100644
index 6702394ef..000000000
--- a/application/language/BahasaIndonesia/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';
-?>
\ No newline at end of file
diff --git a/application/language/BahasaIndonesia/suppliers_lang.php b/application/language/BahasaIndonesia/suppliers_lang.php
deleted file mode 100644
index a99265701..000000000
--- a/application/language/BahasaIndonesia/suppliers_lang.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-$lang['suppliers_new']='Pemasok Baru';
-$lang['suppliers_supplier']='Pemasok';
-$lang['suppliers_update']='Update Pemasok';
-$lang['suppliers_confirm_delete']='Apakah Anda yakin ingin menghapus pemasok yang dipilih?';
-$lang['suppliers_none_selected']='Anda belum memilih pemasok untuk menghapus';
-$lang['suppliers_error_adding_updating'] = 'Error menambah / memperbarui pemasok';
-$lang['suppliers_successful_adding']='Anda telah berhasil menambahkan pemasok';
-$lang['suppliers_successful_updating']='Anda telah berhasil memperbarui pemasok';
-$lang['suppliers_successful_deleted']='Anda telah berhasil menghapus pemasok';
-$lang['suppliers_one_or_multiple']='pemasok';
-$lang['suppliers_cannot_be_deleted']='Tidak bisa dihapus pemasok yang dipilih, satu atau lebih dari pemasok yang dipilih memiliki penjualan.';
-$lang['suppliers_basic_information']='Informasi Pemasok ';
-$lang['suppliers_account_number']='Nomor Akun';
-$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/Language code definition b/application/language/Language code definition
new file mode 100644
index 000000000..be122151f
--- /dev/null
+++ b/application/language/Language code definition	
@@ -0,0 +1,244 @@
+ISO Language Code Table
+-----------------------
+
+Code	Name
+af	Afrikaans
+af-ZA	Afrikaans (South Africa)
+ar	Arabic
+ar-AE	Arabic (U.A.E.)
+ar-BH	Arabic (Bahrain)
+ar-DZ	Arabic (Algeria)
+ar-EG	Arabic (Egypt)
+ar-IQ	Arabic (Iraq)
+ar-JO	Arabic (Jordan)
+ar-KW	Arabic (Kuwait)
+ar-LB	Arabic (Lebanon)
+ar-LY	Arabic (Libya)
+ar-MA	Arabic (Morocco)
+ar-OM	Arabic (Oman)
+ar-QA	Arabic (Qatar)
+ar-SA	Arabic (Saudi Arabia)
+ar-SY	Arabic (Syria)
+ar-TN	Arabic (Tunisia)
+ar-YE	Arabic (Yemen)
+az	Azeri (Latin)
+az-AZ	Azeri (Latin) (Azerbaijan)
+az-AZ	Azeri (Cyrillic) (Azerbaijan)
+be	Belarusian
+be-BY	Belarusian (Belarus)
+bg	Bulgarian
+bg-BG	Bulgarian (Bulgaria)
+bs-BA	Bosnian (Bosnia and Herzegovina)
+ca	Catalan
+ca-ES	Catalan (Spain)
+cs	Czech
+cs-CZ	Czech (Czech Republic)
+cy	Welsh
+cy-GB	Welsh (United Kingdom)
+da	Danish
+da-DK	Danish (Denmark)
+de	German
+de-AT	German (Austria)
+de-CH	German (Switzerland)
+de-DE	German (Germany)
+de-LI	German (Liechtenstein)
+de-LU	German (Luxembourg)
+dv	Divehi
+dv-MV	Divehi (Maldives)
+el	Greek
+el-GR	Greek (Greece)
+en	English
+en-AU	English (Australia)
+en-BZ	English (Belize)
+en-CA	English (Canada)
+en-CB	English (Caribbean)
+en-GB	English (United Kingdom)
+en-IE	English (Ireland)
+en-JM	English (Jamaica)
+en-NZ	English (New Zealand)
+en-PH	English (Republic of the Philippines)
+en-TT	English (Trinidad and Tobago)
+en-US	English (United States)
+en-ZA	English (South Africa)
+en-ZW	English (Zimbabwe)
+eo	Esperanto
+es	Spanish
+es-AR	Spanish (Argentina)
+es-BO	Spanish (Bolivia)
+es-CL	Spanish (Chile)
+es-CO	Spanish (Colombia)
+es-CR	Spanish (Costa Rica)
+es-DO	Spanish (Dominican Republic)
+es-EC	Spanish (Ecuador)
+es-ES	Spanish (Castilian)
+es-ES	Spanish (Spain)
+es-GT	Spanish (Guatemala)
+es-HN	Spanish (Honduras)
+es-MX	Spanish (Mexico)
+es-NI	Spanish (Nicaragua)
+es-PA	Spanish (Panama)
+es-PE	Spanish (Peru)
+es-PR	Spanish (Puerto Rico)
+es-PY	Spanish (Paraguay)
+es-SV	Spanish (El Salvador)
+es-UY	Spanish (Uruguay)
+es-VE	Spanish (Venezuela)
+et	Estonian
+et-EE	Estonian (Estonia)
+eu	Basque
+eu-ES	Basque (Spain)
+fa	Farsi
+fa-IR	Farsi (Iran)
+fi	Finnish
+fi-FI	Finnish (Finland)
+fo	Faroese
+fo-FO	Faroese (Faroe Islands)
+fr	French
+fr-BE	French (Belgium)
+fr-CA	French (Canada)
+fr-CH	French (Switzerland)
+fr-FR	French (France)
+fr-LU	French (Luxembourg)
+fr-MC	French (Principality of Monaco)
+gl	Galician
+gl-ES	Galician (Spain)
+gu	Gujarati
+gu-IN	Gujarati (India)
+he	Hebrew
+he-IL	Hebrew (Israel)
+hi	Hindi
+hi-IN	Hindi (India)
+hr	Croatian
+hr-BA	Croatian (Bosnia and Herzegovina)
+hr-HR	Croatian (Croatia)
+hu	Hungarian
+hu-HU	Hungarian (Hungary)
+hy	Armenian
+hy-AM	Armenian (Armenia)
+id	Indonesian
+id-ID	Indonesian (Indonesia)
+is	Icelandic
+is-IS	Icelandic (Iceland)
+it	Italian
+it-CH	Italian (Switzerland)
+it-IT	Italian (Italy)
+ja	Japanese
+ja-JP	Japanese (Japan)
+ka	Georgian
+ka-GE	Georgian (Georgia)
+kk	Kazakh
+kk-KZ	Kazakh (Kazakhstan)
+kn	Kannada
+kn-IN	Kannada (India)
+ko	Korean
+ko-KR	Korean (Korea)
+kok	Konkani
+kok-IN	Konkani (India)
+ky	Kyrgyz
+ky-KG	Kyrgyz (Kyrgyzstan)
+lt	Lithuanian
+lt-LT	Lithuanian (Lithuania)
+lv	Latvian
+lv-LV	Latvian (Latvia)
+mi	Maori
+mi-NZ	Maori (New Zealand)
+mk	FYRO Macedonian
+mk-MK	FYRO Macedonian (Former Yugoslav Republic of Macedonia)
+mn	Mongolian
+mn-MN	Mongolian (Mongolia)
+mr	Marathi
+mr-IN	Marathi (India)
+ms	Malay
+ms-BN	Malay (Brunei Darussalam)
+ms-MY	Malay (Malaysia)
+mt	Maltese
+mt-MT	Maltese (Malta)
+nb	Norwegian (Bokm?l)
+nb-NO	Norwegian (Bokm?l) (Norway)
+nl	Dutch
+nl-BE	Dutch (Belgium)
+nl-NL	Dutch (Netherlands)
+nn-NO	Norwegian (Nynorsk) (Norway)
+ns	Northern Sotho
+ns-ZA	Northern Sotho (South Africa)
+pa	Punjabi
+pa-IN	Punjabi (India)
+pl	Polish
+pl-PL	Polish (Poland)
+ps	Pashto
+ps-AR	Pashto (Afghanistan)
+pt	Portuguese
+pt-BR	Portuguese (Brazil)
+pt-PT	Portuguese (Portugal)
+qu	Quechua
+qu-BO	Quechua (Bolivia)
+qu-EC	Quechua (Ecuador)
+qu-PE	Quechua (Peru)
+ro	Romanian
+ro-RO	Romanian (Romania)
+ru	Russian
+ru-RU	Russian (Russia)
+sa	Sanskrit
+sa-IN	Sanskrit (India)
+se	Sami (Northern)
+se-FI	Sami (Northern) (Finland)
+se-FI	Sami (Skolt) (Finland)
+se-FI	Sami (Inari) (Finland)
+se-NO	Sami (Northern) (Norway)
+se-NO	Sami (Lule) (Norway)
+se-NO	Sami (Southern) (Norway)
+se-SE	Sami (Northern) (Sweden)
+se-SE	Sami (Lule) (Sweden)
+se-SE	Sami (Southern) (Sweden)
+sk	Slovak
+sk-SK	Slovak (Slovakia)
+sl	Slovenian
+sl-SI	Slovenian (Slovenia)
+sq	Albanian
+sq-AL	Albanian (Albania)
+sr-BA	Serbian (Latin) (Bosnia and Herzegovina)
+sr-BA	Serbian (Cyrillic) (Bosnia and Herzegovina)
+sr-SP	Serbian (Latin) (Serbia and Montenegro)
+sr-SP	Serbian (Cyrillic) (Serbia and Montenegro)
+sv	Swedish
+sv-FI	Swedish (Finland)
+sv-SE	Swedish (Sweden)
+sw	Swahili
+sw-KE	Swahili (Kenya)
+syr	Syriac
+syr-SY	Syriac (Syria)
+ta	Tamil
+ta-IN	Tamil (India)
+te	Telugu
+te-IN	Telugu (India)
+th	Thai
+th-TH	Thai (Thailand)
+tl	Tagalog
+tl-PH	Tagalog (Philippines)
+tn	Tswana
+tn-ZA	Tswana (South Africa)
+tr	Turkish
+tr-TR	Turkish (Turkey)
+tt	Tatar
+tt-RU	Tatar (Russia)
+ts	Tsonga
+uk	Ukrainian
+uk-UA	Ukrainian (Ukraine)
+ur	Urdu
+ur-PK	Urdu (Islamic Republic of Pakistan)
+uz	Uzbek (Latin)
+uz-UZ	Uzbek (Latin) (Uzbekistan)
+uz-UZ	Uzbek (Cyrillic) (Uzbekistan)
+vi	Vietnamese
+vi-VN	Vietnamese (Viet Nam)
+xh	Xhosa
+xh-ZA	Xhosa (South Africa)
+zh	Chinese
+zh-CN	Chinese (S)
+zh-HK	Chinese (Hong Kong)
+zh-MO	Chinese (Macau)
+zh-SG	Chinese (Singapore)
+zh-TW	Chinese (T)
+zu	Zulu
+zu-ZA	Zulu (South Africa)
+
diff --git a/application/language/Russian/common_lang.php b/application/language/Russian/common_lang.php
deleted file mode 100644
index c501ddf2e..000000000
--- a/application/language/Russian/common_lang.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-$lang['common_common']='общественно';
-$lang['common_submit']='Подавать';
-$lang['common_or']='ИЛИ';
-$lang['common_powered_by']='самоходные из';
-$lang['common_welcome']='Добро пожаловать';
-$lang['common_logout']='Выход';
-$lang['common_list_of']='Список';
-$lang['common_first_name']='Имя';
-$lang['common_last_name']='Фамилия';
-$lang['common_email']='Электронная почта';
-$lang['common_phone_number']='Номер телефона';
-$lang['common_address_1']='Адрес 1';
-$lang['common_address_2']='Адрес 2';
-$lang['common_city']='Город';
-$lang['common_state']='Штат';
-$lang['common_zip']='Почтовый индекс';
-$lang['common_country']='Страна';
-$lang['common_comments']='Комментарии';
-$lang['common_edit']='редактировать';
-$lang['common_search']='Пойск';
-$lang['common_delete']='Удалить';
-$lang['common_remove']='Снимать';
-$lang['common_view_recent_sales']='Посмотреть Недавние Продажи';
-$lang['common_you_are_using_ospos']='Вы использоваете Open Source Point Of Sale Версия';
-$lang['common_please_visit_my']='пожалуйста, посетите';
-$lang['common_website']='веб-сайт';
-$lang['common_fields_required_message']='Красные пробела обязательно';
-$lang['common_learn_about_project']=', чтобы узнать самую последнюю информацию о проекте';
-$lang['common_searched_for']='Искали за';
-$lang['common_first_name_required']='Имя обязательный пробел';
-$lang['common_last_name_required']='Фамилия обязательный пробел';
-$lang['common_email_invalid_format']='Это электронная почта не в нужный формат';
-$lang['common_confirm_search']='Вы выбрали одну или несколько строк, это больше не будет быть выбрано после поиска. Вы уверены, что хотите, чтобы представить этот поиск?';
-$lang['common_no_persons_to_display']='Там нет людей, чтобы отобразить';
-$lang['common_return_policy']='Возвратний полис';
-$lang['common_price']='Цена';
-$lang['common_welcome_message']= 'Добро пожаловать в Open Source Point Of Sale, нажмите модуля ниже, чтобы начать!';
-$lang['common_inv']='инв';
-$lang['common_det']='детали';
-?>
\ No newline at end of file
diff --git a/application/language/Russian/config_lang.php b/application/language/Russian/config_lang.php
deleted file mode 100644
index 05f6082ee..000000000
--- a/application/language/Russian/config_lang.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-$lang['config_info']='информация о магазин конфигурация';
-$lang['config_company']='Название Компании';
-$lang['config_address']='Адрес Компании';
-$lang['config_phone']='Телефон Компании';
-$lang['config_website']='Веб-сайт';
-$lang['config_fax']='Факс';
-$lang['config_default_tax_rate']='Обычный ставка налога %';
-$lang['config_default_tax_rate_1']='ставка налога 1';
-$lang['config_default_tax_rate_2']='ставка налога 2';
-$lang['config_company_required']='Имя Компании обязательный пробел';
-$lang['config_address_required']='Адрес Компании обязательный пробел';
-$lang['config_phone_required']='Телефон Компании обязательный пробел';
-$lang['config_default_tax_rate_required']='Обычный ставка налога обязательный пробел';
-$lang['config_default_tax_rate_number']='Обычный ставка налога должен быть цифра';
-$lang['config_company_website_url']='Веб-сайт Компании не является допустимым URL (http://...)';
-$lang['config_saved_successfully']='Конфигурация успешно сохранена';
-$lang['config_saved_unsuccessfully']='Конфигурация сохраненная безуспешно';
-$lang['config_return_policy_required']='Возвратний полис обязательный пробел';
-$lang['config_print_after_sale']='Распечатать квитанцию ​​после продажи';
-$lang['config_language'] = 'Язик';
-$lang['config_timezone'] = 'Часовой пояс';
-$lang['config_currency_symbol'] = 'Символ валюты';
-$lang['config_currency_side'] = 'Правая сторона'; //GARRISON ADDED 4/20/2013
-$lang['config_custom1'] = 'Изготовленный пробел 1'; //GARRISON ADDED 4/21/2013
-$lang['config_custom2'] = 'Изготовленный пробел 2'; //GARRISON ADDED 4/21/2013
-$lang['config_custom3'] = 'Изготовленный пробел 3'; //GARRISON ADDED 4/21/2013
-$lang['config_custom4'] = 'Изготовленный пробел 4'; //GARRISON ADDED 4/21/2013
-$lang['config_custom5'] = 'Изготовленный пробел 5'; //GARRISON ADDED 4/21/2013
-$lang['config_custom6'] = 'Изготовленный пробел 6'; //GARRISON ADDED 4/21/2013
-$lang['config_custom7'] = 'Изготовленный пробел 7'; //GARRISON ADDED 4/21/2013
-$lang['config_custom8'] = 'Изготовленный пробел 8'; //GARRISON ADDED 4/21/2013
-$lang['config_custom9'] = 'Изготовленный пробел 9'; //GARRISON ADDED 4/21/2013
-$lang['config_custom10'] = 'Изготовленный пробел 10'; //GARRISON ADDED 4/21/2013
-?>
\ No newline at end of file
diff --git a/application/language/Russian/customers_lang.php b/application/language/Russian/customers_lang.php
deleted file mode 100644
index 685e72bc1..000000000
--- a/application/language/Russian/customers_lang.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-$lang['customers_new']='Новый Клиент';
-$lang['customers_customer']='Клиент';
-$lang['customers_update']='Обновлять Клиент';
-$lang['customers_confirm_delete']='Вы уверены, что хотите удалить выбранных клиентов?';
-$lang['customers_none_selected']='Вы не выбрали ни клиентов, чтобы удалить.';
-$lang['customers_error_adding_updating'] = 'Ошибка при добавлении/обновлении клиента';
-$lang['customers_successful_adding']='Вы успешно добавили клиентов';
-$lang['customers_successful_updating']='Вы успешно обновили клиент';
-$lang['customers_successful_deleted']='Вы успешно удалили';
-$lang['customers_one_or_multiple']='клиент(ов)';
-$lang['customers_cannot_be_deleted']='Невозможно удалить выбранных клиентов, один или более из них имеет продаж.';
-$lang['customers_basic_information']='Информация о клиенте';
-$lang['customers_account_number']='Номер счота';
-$lang['customers_taxable']='облагаемый';
-?>
diff --git a/application/language/Russian/employees_lang.php b/application/language/Russian/employees_lang.php
deleted file mode 100644
index 4de2d6300..000000000
--- a/application/language/Russian/employees_lang.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-$lang['employees_employee']='Сотрудник';
-$lang['employees_new']='Новый Сотрудник';
-$lang['employees_update']='Обновлять Сотрудник';
-$lang['employees_confirm_delete']='Вы уверены, что хотите удалить выбранную сотрудников?';
-$lang['employees_none_selected']='Вы не выбрали ни сотрудников для удаления';
-$lang['employees_error_adding_updating'] = 'Ошибка при добавлении/обновлении сотрудника';
-$lang['employees_successful_adding']='Вы успешно добавили сотрудника';
-$lang['employees_successful_updating']='Вы успешно обновили сотрудника';
-$lang['employees_successful_deleted']='Вы успешно удалили';
-$lang['employees_one_or_multiple']='сотрудник(ов)';
-$lang['employees_cannot_be_deleted']='Не возможно удалить выбранный сотрудников, одного или более работников обработал продаж или вы пытаетесь удалить себя';
-$lang['employees_username']='Имя пользователя';
-$lang['employees_password']='Пароль';
-$lang['employees_repeat_password']='Повторяете пароль';
-$lang['employees_username_required']='Имя пользователи обязательный пробел';
-$lang['employees_username_minlength']='Имя пользователя должна быть не менее 5 символов';
-$lang['employees_password_required']='Пароль обязательно';
-$lang['employees_password_minlength']='Пароль должен быть не менее 8 символов';
-$lang['employees_password_must_match']='Пароли не совпадают';
-$lang['employees_basic_information']='Сотрудник Базовая Информация';
-$lang['employees_login_info']='Информация для сотрудников Входа';
-$lang['employees_permission_info']='Сотрудник разрешениями и правами доступа';
-$lang['employees_permission_desc']='Отметьте флажками ниже, чтобы предоставить доступ к модулям';
-$lang['employees_error_updating_demo_admin'] = 'Вы не можете изменить пользователь демонстрация аккаунт';
-$lang['employees_error_deleting_demo_admin'] = 'Вы не можете удалить пользователь демонстрация аккаунт';
-?>
diff --git a/application/language/Russian/error_lang.php b/application/language/Russian/error_lang.php
deleted file mode 100644
index 3efc57ae5..000000000
--- a/application/language/Russian/error_lang.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$lang['error_no_permission_module']='У вас нет разрешения на доступ к модуля называется';
-$lang['error_unknown']='неизвестный';
-?>
diff --git a/application/language/Russian/giftcards_lang.php b/application/language/Russian/giftcards_lang.php
deleted file mode 100644
index 8885c5fac..000000000
--- a/application/language/Russian/giftcards_lang.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-$lang['giftcards_giftcard_number']='Номер Подарочную карту';
-$lang['giftcards_card_value']='стоимость';
-$lang['giftcards_basic_information']='информация Подарочную карту';
-$lang['giftcards_number_required']='Номер Подарочную карту обязательный пробел';
-$lang['giftcards_value_required']='стоимость Подарочную карту обязательный пробел';
-$lang['giftcards_number']='Номер Подарочную карту должна быть цифрая';
-$lang['giftcards_value']='стоимость Подарочную карту должна быть цифрая';
-$lang['giftcards_person_id']='Клиент';
-
-$lang['giftcards_retrive_giftcard_info']='находить и подавать информация Подарочную карту';
-$lang['giftcards_description']='Описание';
-$lang['giftcards_amazon']='Amazon';
-$lang['giftcards_upc_database']='UPC база данных';
-$lang['giftcards_cannot_find_giftcard']='Не можете найти любую информацию о Подарочную карту';
-$lang['giftcards_info_provided_by']='Информация предоставлена';
-$lang['giftcards_number_information']='Номер Подарочную карту';
-$lang['giftcards_new']='Новая Подарочная карта';
-$lang['giftcards_update']='Обновлять Подарочная карта';
-$lang['giftcards_giftcard']='Подарочная карта';
-$lang['giftcards_edit_multiple_giftcards']='Редактирование нескольких Подарочные карты';
-$lang['giftcards_category']='категория';
-$lang['giftcards_cost_price']='Оптовая Цена';
-$lang['giftcards_unit_price']='Розничная Цена';
-$lang['giftcards_tax_1']='Налог 1';
-$lang['giftcards_tax_2']='Налог 2';
-$lang['giftcards_sales_tax_1'] = 'Налог с продаж';
-$lang['giftcards_sales_tax_2'] = 'Налог с продаж 2';
-$lang['giftcards_tax_percent']='процент налога';
-$lang['giftcards_tax_percents']='процент налога';
-$lang['giftcards_reorder_level']='минимальный уровень для перезаказ';
-$lang['giftcards_quantity']='Количество';
-$lang['giftcards_no_giftcards_to_display']='Нет Подарочные карты для отображения';
-$lang['giftcards_bulk_edit']='Массовое изменение';
-$lang['giftcards_confirm_delete']='Вы уверены, что хотите удалить выбранную Подарочные карты?';
-$lang['giftcards_none_selected']='Вы не выбрали ни Подарочные карты для редактирования';
-$lang['giftcards_confirm_bulk_edit']='Вы уверены, что хотите редактировать все выбранные Подарочные карты?';
-$lang['giftcards_successful_bulk_edit']='Вы успешно обновили выбранной Подарочные карты';
-$lang['giftcards_error_updating_multiple']='Ошибка при обновлении Подарочные карты';
-$lang['giftcards_edit_fields_you_want_to_update']='Отредактируйте поля вы хотите изменить для всех выбранных Подарочные карты';
-$lang['giftcards_error_adding_updating'] = 'Ошибка при добавлении/обновлении подарочную карту';
-$lang['giftcards_successful_adding']='Вы успешно добавили подарочную карту';
-$lang['giftcards_successful_updating']='Вы успешно обновили подарочную карту';
-$lang['giftcards_successful_deleted']='Вы успешно удален';
-$lang['giftcards_one_or_multiple']='подарочную карту';
-$lang['giftcards_cannot_be_deleted']='Не удалось удалить выбранные подарочные карты, одну или несколько из выбранных подарочные карты имеет продаж.';
-$lang['giftcards_none'] = 'Ни один';
-$lang['giftcards_supplier'] = 'Поставщик';
-$lang['giftcards_generate_barcodes'] = 'Создание штрих-кодов';
-$lang['giftcards_must_select_giftcard_for_barcode'] = 'Вы должны выбрать хотя бы 1 подарочная карта для создания штрих-кодов';
-$lang['giftcards_excel_import_failed'] = 'Ошибка импорта Excel';
-$lang['giftcards_allow_alt_desciption'] = 'Разрешить альтернативные Описание';
-$lang['giftcards_is_serialized'] = 'Подарочная карта имеет серийный номер';
-$lang['giftcards_low_inventory_giftcards'] = 'Низкий Подарочные карты инвентаризации';
-$lang['giftcards_serialized_giftcards'] = 'Сериализованные Подарочные карты';
-$lang['giftcards_no_description_giftcards'] = 'Нет Описание Подарочные карты';
-$lang['giftcards_inventory_comments']='Комментарии';
-$lang['giftcards_count']='Обновление перечня';
-$lang['giftcards_details_count']='Подробная инвентаризация';
-$lang['giftcards_add_minus']='Инвентарь для сложения/вычитания';
-$lang['giftcards_current_quantity']='Токовые';
-$lang['giftcards_quantity_required']='Количество является обязательным полем. Пожалуйста, закройте (X), чтобы отменить';
-$lang['giftcards_do_nothing'] = 'Ничего не делать';
-$lang['giftcards_change_all_to_serialized'] = 'Заменить все в сериализованную';
-$lang['giftcards_change_all_to_unserialized'] = 'Чтобы изменить все десериализуются';
-$lang['giftcards_change_all_to_allow_alt_desc'] = 'Разрешить альтернативные Описание Для всех';
-$lang['giftcards_change_all_to_not_allow_allow_desc'] = 'Не позволяйте Альтернативные Описание Для всех';
-$lang['giftcards_use_inventory_menu'] = 'Используйте меню инвентаря';
-$lang['giftcards_manually_editing_of_quantity'] = 'Руководство Изменить количество';
-?>
diff --git a/application/language/Russian/items_lang.php b/application/language/Russian/items_lang.php
deleted file mode 100644
index 8972dd6fe..000000000
--- a/application/language/Russian/items_lang.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-$lang['items_item_number']='UPC/EAN/ISBN';
-$lang['items_retrive_item_info']='Получить Детальная информация';
-$lang['items_description']='Описание';
-$lang['items_amazon']='Amazon';
-$lang['items_upc_database']='UPC база данных';
-$lang['items_cannot_find_item']='не могу найти любую информацию о товаре';
-$lang['items_info_provided_by']='Информация, представленная';
-$lang['items_basic_information']='информацию о товаре';
-$lang['items_number_information']='Номер Товара';
-$lang['items_new']='Новый Товар';
-$lang['items_update']='Обновить Товар';
-$lang['items_item']='Товар';
-$lang['items_edit_multiple_items']='Редактирование нескольких товаров';
-$lang['items_name']='название товара';
-$lang['items_category']='Категория';
-$lang['items_cost_price']='Оптовая Цена';//GARRISON ADDED 4/21/2013
-$lang['items_unit_price']='Розничная Цена';//GARRISON ADDED 4/21/2013
-$lang['items_tax_1']='Налог 1';
-$lang['items_tax_2']='Налог 2';
-$lang['items_sales_tax_1'] = 'Налог на покупку';
-$lang['items_sales_tax_2'] = 'Налог на покупку 2';
-$lang['items_tax_percent']='процент налога';
-$lang['items_tax_percents']='процент налога(и)';
-$lang['items_reorder_level']='Минимальный уровень перед заказом';
-$lang['items_quantity']='Количество';
-$lang['items_reorder_level']='Минимальный уровень перед заказом';
-$lang['items_no_items_to_display']='Нет товаров для отображения';
-$lang['items_bulk_edit']='Массовое изменение';
-$lang['items_confirm_delete']='Вы уверены, что хотите удалить выбранные товари?';
-$lang['items_none_selected']='Вы не выбрали ни одной товари для редактирования';
-$lang['items_confirm_bulk_edit']='Вы уверены, что хотите редактировать все товари выбраны?';
-$lang['items_successful_bulk_edit']='Вы успешно обновили выбранных товаров';
-$lang['items_error_updating_multiple']='Ошибка при обновлении товаров';
-$lang['items_edit_fields_you_want_to_update']='Отредактируйте пробела вы хотите изменить для всех выбранных товаров';
-$lang['items_error_adding_updating'] = 'Ошибка при добавлении/обновлении товара';
-$lang['items_successful_adding']='Вы успешно добавлен товар';
-$lang['items_successful_updating']='Вы успешно обновленного товара';
-$lang['items_successful_deleted']='Вы успешно удалили';
-$lang['items_one_or_multiple']='товар(а)';
-$lang['items_cannot_be_deleted']='Невозможно удалить выбранные товари, один или более из выбранных товаров имеет продаж.';
-$lang['items_name_required']='Название товара обязательное пробелья';
-$lang['items_category_required']='Категория обязательное пробелья';
-$lang['items_buy_price_required']='Цена покупки обязательное пробелья';
-$lang['items_unit_price_required']='Розничная цена обязательное пробелья';
-$lang['items_cost_price_required']='Оптовая цена обязательное пробелья';
-$lang['items_tax_percent_required']='Процент Налоги обязательное пробелья';
-$lang['items_quantity_required']='Количество обязательное пробелья';
-$lang['items_reorder_level_required']='Минимальный уровень перед заказом обязательное пробелья';
-$lang['items_unit_price_number']='Розничная Цена должно быть число';
-$lang['items_cost_price_number']='Оптовая цена должно быть число';
-$lang['items_quantity_number']='Количество должно быть число';
-$lang['items_reorder_level_number']='Минимальный уровень перед заказом должно быть число';
-$lang['items_none'] = 'Ничего';
-$lang['items_supplier'] = 'Поставщик';
-$lang['items_generate_barcodes'] = 'Создайте штрих-кодов';
-$lang['items_must_select_item_for_barcode'] = 'Вы должны выбрать хотя бы 1 товар для создания штрих-кодов';
-$lang['items_excel_import_failed'] = 'Ошибка импорта Excel';
-$lang['items_allow_alt_desciption'] = 'Разрешить альтернативные описания';
-$lang['items_is_serialized'] = 'Товар имеет серийный номер';
-$lang['items_low_inventory_items'] = 'Низкий инвентаризации товары';
-$lang['items_serialized_items'] = 'Сериализованные товары';
-$lang['items_no_description_items'] = 'без Описание товары';
-$lang['items_search_custom_items'] = 'Искать в дополнительных товарях';//GARRISON ADDED
-$lang['items_inventory_comments']='Комментарии';
-$lang['items_count']='Обновление инвентории';
-$lang['items_details_count']='детали инвентаризацего количество';
-$lang['items_add_minus']='Инвентарь для сложения/вычитания';
-$lang['items_current_quantity']='Количество Сейчас';
-$lang['items_quantity_required']='Количество обязательное пробелья. Пожалуйста, закройте (X), чтобы отменить';
-$lang['items_do_nothing'] = 'Ничего не делать';
-$lang['items_change_all_to_serialized'] = 'Изменить все в сериализованную';
-$lang['items_change_all_to_unserialized'] = 'Изменить все в несериализованную';
-$lang['items_change_all_to_allow_alt_desc'] = 'Разрешить альтернативные Описание для всех';
-$lang['items_change_all_to_not_allow_allow_desc'] = 'Не разрешить альтернативные Описание для всех';
-$lang['items_use_inventory_menu'] = 'Используйте меню инвентаря';
-$lang['items_manually_editing_of_quantity'] = 'Руководство Изменить количество';
-$lang['items_inventory'] = 'инвентаризация';
-$lang['items_location'] = 'место';
-?>
diff --git a/application/language/Russian/login_lang.php b/application/language/Russian/login_lang.php
deleted file mode 100644
index b0bdae042..000000000
--- a/application/language/Russian/login_lang.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$lang['login_login']='Вход';
-$lang['login_username']='Имя';
-$lang['login_password']='Пароль';
-$lang['login_go']='ходите';
-$lang['login_invalid_username_and_password']='Неправелная Имя/Пароль';
-$lang['login_welcome_message']='Добро пожаловать в Open Source Point of Sale. Чтобы продолжить, пожалуйста войдите на сайт, используя имя и пароль.';
-?>
diff --git a/application/language/Russian/module_lang.php b/application/language/Russian/module_lang.php
deleted file mode 100644
index c618f6e73..000000000
--- a/application/language/Russian/module_lang.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-$lang['module_home']='Дома';
-
-$lang['module_customers']='Клиенты';
-$lang['module_customers_desc']='Добавление, обновление, удаление и поиск клиентов';
-
-$lang['module_suppliers']='Поставщики';
-$lang['module_suppliers_desc']='Добавление, обновление, удаление и поиск suppliers';
-
-$lang['module_employees']='Сотрудники';
-$lang['module_employees_desc']='Добавление, обновление, удаление и поиск сотрудники';
-
-$lang['module_sales']='Продажа';
-$lang['module_sales_desc']='Процесс продажи и возвращается';
-
-$lang['module_reports']='Отчеты';
-$lang['module_reports_desc']='Просмотр и создание отчетов';
-
-$lang['module_items']='Товары';
-$lang['module_items_desc']='Добавление, обновление, удаление и поиск товары';
-
-$lang['module_config']='Конфигурацию магазина';
-$lang['module_config_desc']='Изменить конфигурацию магазина';
-
-$lang['module_receivings']='получении';
-$lang['module_receivings_desc']='Процесс покупки заказов';
-
-$lang['module_giftcards']='Подарочные карты';
-$lang['module_giftcards_desc']='Добавление, обновление, удаление и поиск подарочные карты';
-
-$lang['module_item_kits']='товара комплекти';
-$lang['module_item_kits_desc']='Добавление, обновление, удаление и поиск товара комплекти';
-
-?>
diff --git a/application/language/Russian/receivings_lang.php b/application/language/Russian/receivings_lang.php
deleted file mode 100644
index 4f1aecbf9..000000000
--- a/application/language/Russian/receivings_lang.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-$lang['recvs_register']='Получение товаров';
-$lang['recvs_mode']='получая режим';
-$lang['recvs_receiving']='получать';
-$lang['recvs_return']='возвращать';
-$lang['recvs_total']='сумма';
-$lang['recvs_cost']='стоимость';
-$lang['recvs_quantity']='Кол-во.';
-$lang['recvs_discount']='Скидка %';
-$lang['recvs_edit']='редактировать';
-$lang['recvs_new_supplier'] = 'Новый поставщик';
-$lang['recvs_supplier'] = 'поставщик';
-$lang['recvs_select_supplier']='Выберите поставщика (необязательно)';
-$lang['recvs_start_typing_supplier_name']='Начните вводить название поставщика...';
-$lang['recvs_unable_to_add_item']='Невозможно добавить товар на получение';
-$lang['recvs_error_editing_item']='Ошибка редактирования товар';
-$lang['recvs_receipt']='квитанция о получении';
-$lang['recvs_complete_receiving']='заканчивать';
-$lang['recvs_confirm_finish_receiving'] = 'Вы уверены, что хотите представить это получение? Это не может быть отменено.';
-$lang['recvs_confirm_cancel_receiving'] = 'Вы уверены, что хотите удалить это получение? Все детали будут очищены.';
-$lang['recvs_find_or_scan_item']='Найти/Сканировать товар';
-$lang['recvs_find_or_scan_item_or_receipt']='Найти/Сканировать товар ИЛИ квитанция';
-$lang['recvs_id']='получение ID';
-$lang['recvs_item_name'] = 'Название товара';
-$lang['receivings_transaction_failed'] = 'Ошибка Получение транзакции';
-?>
diff --git a/application/language/Russian/suppliers_lang.php b/application/language/Russian/suppliers_lang.php
deleted file mode 100644
index ed2daec00..000000000
--- a/application/language/Russian/suppliers_lang.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-$lang['suppliers_new']='Новый поставщик';
-$lang['suppliers_supplier']='поставщик';
-$lang['suppliers_update']='Обновить поставщика';
-$lang['suppliers_confirm_delete']='Вы уверены, что хотите удалить выбранных поставщиков?';
-$lang['suppliers_none_selected']='Вы не выбрали ни поставщики удалить';
-$lang['suppliers_error_adding_updating'] = 'Ошибка при добавлении/обновлении поставщиком';
-$lang['suppliers_successful_adding']='Вы успешно добавили поставщиком';
-$lang['suppliers_successful_updating']='Вы успешно обновляли поставщиком';
-$lang['suppliers_successful_deleted']='Вы успешно удален';
-$lang['suppliers_one_or_multiple']='поставщик (а)';
-$lang['suppliers_cannot_be_deleted']='Не удалось удалить выбранные поставщиков, один или более из выбранных поставщиков имеет продаж.';
-$lang['suppliers_basic_information']='Информация о поставщике';
-$lang['suppliers_account_number']='№ счета';
-$lang['suppliers_company_name']='Название компании';
-$lang['suppliers_company_name_required'] = 'Название компании является обязательным полем';
-?>
diff --git a/application/language/Spanish/common_lang.php b/application/language/Spanish/common_lang.php
deleted file mode 100644
index 474db8325..000000000
--- a/application/language/Spanish/common_lang.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-$lang['common_common']='común';
-$lang['common_submit']='Enviar';
-$lang['common_or']='Ó';
-$lang['common_powered_by']='Empoderado por';
-$lang['common_welcome']='Bienvenido(a)';
-$lang['common_logout']='Salir';
-$lang['common_list_of']='Lista de';
-$lang['common_first_name']='Nombre';
-$lang['common_last_name']='Apellidos';
-$lang['common_email']='E-Mail';
-$lang['common_phone_number']='Teléfono';
-$lang['common_address_1']='Dirección 1';
-$lang['common_address_2']='Dirección 2';
-$lang['common_city']='Ciudad';
-$lang['common_state']='Estado';
-$lang['common_zip']='C.P.';
-$lang['common_country']='País';
-$lang['common_comments']='Comentarios';
-$lang['common_edit']='editar';
-$lang['common_search']='Buscar';
-$lang['common_delete']='Borrar';
-$lang['common_view_recent_sales']='Ver Ventas Recientes';
-$lang['common_you_are_using_ospos']='Estás usando Open Source Point Of Sale Versión';
-$lang['common_please_visit_my']='Por favor, visita mi';
-$lang['common_website']='sitio';
-$lang['common_fields_required_message']='Los campos en rojo son requeridos';
-$lang['common_learn_about_project']='para leer la información más reciente acerca del proyecto';
-$lang['common_searched_for']='Buscaste';
-$lang['common_first_name_required']='Nombre es un campo requerido';
-$lang['common_last_name_required']='Apellidos es un campo requerido';
-$lang['common_email_invalid_format']='El e-mail no está en el formato requerido';
-$lang['common_confirm_search']='Has seleccionado una o más filas. Éstas no estarán seleccionadas después de tu búsqueda. ¿Seguro(a) que quieres hacer esta búsqueda?';
-$lang['common_no_persons_to_display']='No hay gente que mostrar';
-$lang['common_return_policy']='Política de reintegro';
-$lang['common_price']='Precio';
-$lang['common_welcome_message']= 'Bienvenido(a) a Open Source Point Of Sale. ¡Haz click en algún módulo; debajo, para empezar!';
-$lang['common_inv']='inv';
-$lang['common_det']='detalles';
-?>
diff --git a/application/language/Spanish/config_lang.php b/application/language/Spanish/config_lang.php
deleted file mode 100644
index a39aa873e..000000000
--- a/application/language/Spanish/config_lang.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-$lang['config_info']='Guarda Información de Configuración';
-$lang['config_company']='Nombre de la Compañía';
-$lang['config_address']='Dirección de la Compañía';
-$lang['config_phone']='Teléfono de la Compañía';
-$lang['config_website']='Sitio Web';
-$lang['config_fax']='Fax';
-$lang['config_default_tax_rate']='% de Impuestos Predeterminada';
-$lang['config_default_tax_rate_1']='Tasa de Impuestos 1';
-$lang['config_default_tax_rate_2']='Tasa de Impuestos 2';
-$lang['config_company_required']='Nombre de la Compañía es requerido';
-$lang['config_address_required']='Dirección de la Compañía es requerida';
-$lang['config_phone_required']='Teléfono de la Compañía es requerido';
-$lang['config_default_tax_rate_required']='La Tasa de Impuestos Predeterminada es requerida';
-$lang['config_default_tax_rate_number']='La Taza de Impuestos Predeterminada debe ser un número';
-$lang['config_company_website_url']='Sitio Web no es un URL estándard (http://...)';
-$lang['config_saved_successfully']='Configuración guardada satisfactoriamente';
-$lang['config_saved_unsuccessfully']='Configuración no guardada';
-$lang['config_return_policy_required']='Política de Reintegro es requerida';
-$lang['config_print_after_sale']='Imprimir recibo después de una venta';
-$lang['config_language'] = 'Idioma';
-$lang['config_timezone'] = 'Zona Horaria';
-$lang['config_currency_symbol'] = 'Currency Symbol';
-?>
diff --git a/application/language/Spanish/customers_lang.php b/application/language/Spanish/customers_lang.php
deleted file mode 100644
index d36370d53..000000000
--- a/application/language/Spanish/customers_lang.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-$lang['customers_new']='Nuevo Cliente';
-$lang['customers_customer']='Cliente';
-$lang['customers_update']='Actualizar Cliente';
-$lang['customers_confirm_delete']='¿Estás seguro(a) de que quieres borrar a los clientes seleccionados?';
-$lang['customers_none_selected']='No has selccionado clientes para ser borrados';
-$lang['customers_error_adding_updating'] = 'Error agregando/actualizando cliente';
-$lang['customers_successful_adding']='Has agregado satisfactoriamente al cliente';
-$lang['customers_successful_updating']='No se ha podido agregar al cliente';
-$lang['customers_successful_deleted']='Has borrado satisfactoriamente a';
-$lang['customers_one_or_multiple']='cliente(s)';
-$lang['customers_cannot_be_deleted']='No se pudo borrar a los clientes seleccionados. Uno o más de éstos tiene ventas.';
-$lang['customers_basic_information']='Información de Clientes';
-$lang['customers_account_number']='Cuenta #';
-$lang['customers_taxable']='Gravable';
-?>
diff --git a/application/language/Spanish/employees_lang.php b/application/language/Spanish/employees_lang.php
deleted file mode 100644
index 52be3d99c..000000000
--- a/application/language/Spanish/employees_lang.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-$lang['employees_employee']='Empleado';
-$lang['employees_new']='Nuevo Empleado';
-$lang['employees_update']='Actualizar Empleado';
-$lang['employees_confirm_delete']='¿Estás seguro(a) quie quieres borrar a los empleados seleccionados?';
-$lang['employees_none_selected']='No has seleccionado empleados para borrar';
-$lang['employees_error_adding_updating'] = 'Error al agregar/actualizar empleado';
-$lang['employees_successful_adding']='Has agregado al empleado satisfactoriamente';
-$lang['employees_successful_updating']='Has actualizado al empleado satisfactoriamente';
-$lang['employees_successful_deleted']='Has borrado satisfactoriamente a';
-$lang['employees_one_or_multiple']='empleado(s)';
-$lang['employees_cannot_be_deleted']='No se pudieron borrar empleados. Uno o másempleados tiene ventas procesadas o estás tratando de borrarte a tí mismo(a).';
-$lang['employees_username']='Usuario';
-$lang['employees_password']='Contraseña';
-$lang['employees_repeat_password']='Contraseña Otra Vez';
-$lang['employees_username_required']='Usuario es requerido';
-$lang['employees_username_minlength']='El Usuario debe tener, por lo menos, 5 caracteres';
-$lang['employees_password_required']='La Contraseña es requerida';
-$lang['employees_password_minlength']='La contraseña debe tener, por lo menos, 8 caracteres';
-$lang['employees_password_must_match']='Las Contraseñas no coinciden';
-$lang['employees_basic_information']='Información Básica de Empleados';
-$lang['employees_login_info']='Información de Ingreso del Empleado';
-$lang['employees_permission_info']='Permisos y Acceso del Empleado';
-$lang['employees_permission_desc']='Activa las cajas debajo para permitir el acceso a los módulos';
-$lang['employees_error_updating_demo_admin'] = 'No puedes cambiar el usuario admin del demo';
-$lang['employees_error_deleting_demo_admin'] = 'No puedes borrar el usuario admin del demo';
-?>
diff --git a/application/language/Spanish/error_lang.php b/application/language/Spanish/error_lang.php
deleted file mode 100644
index aef9e8c43..000000000
--- a/application/language/Spanish/error_lang.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$lang['error_no_permission_module']='No tienes permiso para accesar el módulo llamado';
-$lang['error_unknown']='desconocido';
-?>
diff --git a/application/language/Spanish/giftcards_lang.php b/application/language/Spanish/giftcards_lang.php
deleted file mode 100644
index 4a358491c..000000000
--- a/application/language/Spanish/giftcards_lang.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-$lang['giftcards_giftcard_number']='Número de Tarjeta de Regalo';
-$lang['giftcards_card_value']='Valor';
-$lang['giftcards_basic_information']='Información de Tarjeta de Regalo';
-$lang['giftcards_number_required']='Número de Tarjeta de Regalo es requerido';
-$lang['giftcards_value_required']='Valor de Tarjeta de Regalo es requerido';
-$lang['giftcards_number']='Número de Tarjeta de Regalo debe ser un número';
-$lang['giftcards_value']='Valor de Tarjeta de Regalo debe ser un número';
-
-$lang['giftcards_retrive_giftcard_info']='Obtener Info de Tarjeta de Regalo';
-$lang['giftcards_description']='Descripción';
-$lang['giftcards_amazon']='Amazon';
-$lang['giftcards_upc_database']='Base de Datos UPC';
-$lang['giftcards_cannot_find_giftcard']='No puedo encontrar información acerca de la tarjeta de regalo';
-$lang['giftcards_info_provided_by']='Info provista por';
-$lang['giftcards_number_information']='Número de Tarjeta de Regalo';
-$lang['giftcards_new']='Nueva Tarjeta de Regalo';
-$lang['giftcards_update']='Actualizar Tarjeta de Regalo';
-$lang['giftcards_giftcard']='Tarjeta de Regalo';
-$lang['giftcards_edit_multiple_giftcards']='Editando Múltiples Tarjetas de Regalo';
-$lang['giftcards_category']='Categoría';
-$lang['giftcards_cost_price']='Precio de Costo';
-$lang['giftcards_unit_price']='Precio Unitario';
-$lang['giftcards_tax_1']='Impuesto 1';
-$lang['giftcards_tax_2']='Impuesto 2';
-$lang['giftcards_sales_tax_1'] = 'Impuesto de Venta 1';
-$lang['giftcards_sales_tax_2'] = 'Impuesto de Venta 2';
-$lang['giftcards_tax_percent']='Porcentaje de Impuesto';
-$lang['giftcards_tax_percents']='Porcentaje de Impuesto(s)';
-$lang['giftcards_reorder_level']='Nivel de Reordenamiento';
-$lang['giftcards_quantity']='Cantidad';
-$lang['giftcards_no_giftcards_to_display']='No Giftcards to display';
-$lang['giftcards_bulk_edit']='Edición Múltiple';
-$lang['giftcards_confirm_delete']='¿Estás seguro(a) de querer eliminar las tarjetas de regalo seleccionadas?';
-$lang['giftcards_none_selected']='No has seleccionado tarjetas de regalo para editar';
-$lang['giftcards_confirm_bulk_edit']='¿Estás seguro(a) de querer editar las tarjetas de regalo seleccionadas?';
-$lang['giftcards_successful_bulk_edit']='Has actualizado satisfactoriamente las tarjetas de regalo seleccionadas';
-$lang['giftcards_error_updating_multiple']='Error actualizando tarjetas de regalo';
-$lang['giftcards_edit_fields_you_want_to_update']='Edita los campos que quieras actualizar en TODAS las tarjetas de regalo seleccionadas';
-$lang['giftcards_error_adding_updating'] = 'Error agregando/actualizando tarjeta de regalo';
-$lang['giftcards_successful_adding']='Has agregado satisfactoriamente una tarjeta de regalo';
-$lang['giftcards_successful_updating']='Has actualizado satisfactoriamente una tarjeta de regalo';
-$lang['giftcards_successful_deleted']='Has borrado satisfactoriamente';
-$lang['giftcards_one_or_multiple']='tarjeta(s) de regalo';
-$lang['giftcards_cannot_be_deleted']='No pude borrar las tarjetas seleccionadas. Una o más tiene ventas.';
-$lang['giftcards_none'] = 'Ninguno(a)';
-$lang['giftcards_supplier'] = 'Proveedor';
-$lang['giftcards_generate_barcodes'] = 'Generar Códigos de Barras';
-$lang['giftcards_must_select_giftcard_for_barcode'] = 'Debes seleccionar por lo menos 1 tarjeta para generar códigos de barras';
-$lang['giftcards_excel_import_failed'] = 'Falló la exportación a Excel';
-$lang['giftcards_allow_alt_desciption'] = 'Permitir Descripción Alterna';
-$lang['giftcards_is_serialized'] = 'La Tarjeta de Regalo tiene Número de Serie';
-$lang['giftcards_low_inventory_giftcards'] = 'Tarjetas con Bajo Inventario';
-$lang['giftcards_serialized_giftcards'] = 'Tarjetas Serializadas';
-$lang['giftcards_no_description_giftcards'] = 'Tarjetas de Regalo sin Descripción';
-$lang['giftcards_inventory_comments']='Comentarios';
-$lang['giftcards_count']='Actualizar Inventario';
-$lang['giftcards_details_count']='Detalles del Levantamiento de Inventario';
-$lang['giftcards_add_minus']='Inventario a agregar/substraer';
-$lang['giftcards_current_quantity']='Cantidad Actual';
-$lang['giftcards_quantity_required']='Cantidad es requerido. Por favor, haz click en ( X ) para cancelar';
-$lang['giftcards_do_nothing'] = 'No hacer nada';
-$lang['giftcards_change_all_to_serialized'] = 'Cambiar Todo A Serializado';
-$lang['giftcards_change_all_to_unserialized'] = 'Cambiar Todo A Deserializado';
-$lang['giftcards_change_all_to_allow_alt_desc'] = 'Permitir Descripción Alternativa En Todos';
-$lang['giftcards_change_all_to_not_allow_allow_desc'] = 'No Permitir Descripción Alternativa Para Todos';
-$lang['giftcards_use_inventory_menu'] = 'Usar Menú de Inventario';
-$lang['giftcards_manually_editing_of_quantity'] = 'Edición Manual de Cantidad';
-?>
diff --git a/application/language/Spanish/items_lang.php b/application/language/Spanish/items_lang.php
deleted file mode 100644
index cc4f39bed..000000000
--- a/application/language/Spanish/items_lang.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-$lang['items_item_number']='UPC/EAN/ISBN';
-$lang['items_retrive_item_info']='Obtener Info de Artículo';
-$lang['items_description']='Descripción';
-$lang['items_amazon']='Amazon';
-$lang['items_upc_database']='Base de datos UPC';
-$lang['items_cannot_find_item']='No puedo encontrar información acerca del artículo';
-$lang['items_info_provided_by']='Info provista por';
-$lang['items_basic_information']='Infomación del Artículo';
-$lang['items_number_information']='Número del Artículo';
-$lang['items_new']='Nuevo Artículo';
-$lang['items_update']='Actualizar Artículo';
-$lang['items_item']='Artículo';
-$lang['items_edit_multiple_items']='Editando Artículos Múltiples';
-$lang['items_name']='Nombre del Artículo';
-$lang['items_category']='Categoría';
-$lang['items_cost_price']='Costo';
-$lang['items_unit_price']='Precio Unitario';
-$lang['items_tax_1']='Impuesto 1';
-$lang['items_tax_2']='Impuesto 2';
-$lang['items_sales_tax_1'] = 'Impuesto de Ventas 1';
-$lang['items_sales_tax_2'] = 'Impuesto de Ventas 2';
-$lang['items_tax_percent']='Porcentaje de Impuesto';
-$lang['items_tax_percents']='Porcentaje de Impuesto(s)';
-$lang['items_reorder_level']='Nivel de Reordenamiento';
-$lang['items_quantity']='Cantidad';
-$lang['items_no_items_to_display']='No hay artículos que mostrar';
-$lang['items_bulk_edit']='Edición Múltiple';
-$lang['items_confirm_delete']='¿Estás seguro(a) de querer borrar los artículos seleccionados?';
-$lang['items_none_selected']='No has seleccionado artículos para editar';
-$lang['items_confirm_bulk_edit']='¿Estás seguro(a) de querer editar los artículos seleccionados?';
-$lang['items_successful_bulk_edit']='Has actualizado satisfactoriamente los artículos seleccionados';
-$lang['items_error_updating_multiple']='Error actualizando artículos';
-$lang['items_edit_fields_you_want_to_update']='Edita los campos que quieras actualizar en TODOS los artículos seleccionados';
-$lang['items_error_adding_updating'] = 'Error agregando/actualizando artículo';
-$lang['items_successful_adding']='Has agregado satisfactoriamente un artículo';
-$lang['items_successful_updating']='Has actualizando satisfactoriamente un artículo';
-$lang['items_successful_deleted']='Has borrado satisfactoriamente';
-$lang['items_one_or_multiple']='articulo(s)';
-$lang['items_cannot_be_deleted']='No pude borrar los artículos seleccionados. Uno o más tiene(n) ventas.';
-$lang['items_name_required']='Nombre de Artículo es requerido';
-$lang['items_category_required']='Categoría es requerido';
-$lang['items_buy_price_required']='Precio de Compra es requerido';
-$lang['items_unit_price_required']='Precio Unitario es requerido';
-$lang['items_cost_price_required']='Costo es requerido';
-$lang['items_tax_percent_required']='Porcentaje de Impuesto es requerido';
-$lang['items_quantity_required']='Cantidad es requerido';
-$lang['items_reorder_level_required']='Nivel de Reordenamiento es requerido';
-$lang['items_unit_price_number']='Precio unitario debe ser número';
-$lang['items_cost_price_number']='Costo debe ser número';
-$lang['items_quantity_number']='Cantidad debe ser número';
-$lang['items_reorder_level_number']='Nivel de Reordenamiento debe ser número';
-$lang['items_none'] = 'Ninguno';
-$lang['items_supplier'] = 'Proveedor';
-$lang['items_generate_barcodes'] = 'Generar Códigos de Barras';
-$lang['items_must_select_item_for_barcode'] = 'Debes seleccionar al menos 1 artículo para generar códigos de barras';
-$lang['items_excel_import_failed'] = 'Falló la importación de Excel';
-$lang['items_allow_alt_desciption'] = 'Permitir Descripción Alterna';
-$lang['items_is_serialized'] = 'El Artículo tiene Número de Serie';
-$lang['items_low_inventory_items'] = 'Artículos de Inventario Escaso';
-$lang['items_serialized_items'] = 'Artículos Serializados';
-$lang['items_no_description_items'] = 'Artículos sin Descripción';
-$lang['items_inventory_comments']='Comentarios';
-$lang['items_count']='Actualizar Inventario';
-$lang['items_details_count']='Detalles de Cuenta de Inventario';
-$lang['items_add_minus']='Inventario a agregar/substraer';
-$lang['items_current_quantity']='Cantidad Actual';
-$lang['items_do_nothing'] = 'Hacer Nada';
-$lang['items_change_all_to_serialized'] = 'Cambiar Todo A Serializado';
-$lang['items_change_all_to_unserialized'] = 'Cambiar Todo A Deserializado';
-$lang['items_change_all_to_allow_alt_desc'] = 'Permitir Descripción Alterna Para Todos';
-$lang['items_change_all_to_not_allow_allow_desc'] = 'Denegar Descripción Alterna Para Todos';
-$lang['items_use_inventory_menu'] = 'Usar Menú de Inv.';
-$lang['items_manually_editing_of_quantity'] = 'Edición Manual de Cantidad';
-$lang['items_inventory'] = 'Inventario';
-$lang['items_location'] = 'Locación';
-?>
diff --git a/application/language/Spanish/login_lang.php b/application/language/Spanish/login_lang.php
deleted file mode 100644
index 8c60ff3a4..000000000
--- a/application/language/Spanish/login_lang.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$lang['login_login']='Iniciar Sesión';
-$lang['login_username']='Usuario';
-$lang['login_password']='Contraseña';
-$lang['login_go']='Ir';
-$lang['login_invalid_username_and_password']='Usuario/Contraseña inválidos';
-$lang['login_welcome_message']='Bienvenido(a) al Sistema Open Source Point of Sale. Para continuar, inicia sesión usando tu Usuario y Contraseña.';
-?>
diff --git a/application/language/Spanish/module_lang.php b/application/language/Spanish/module_lang.php
deleted file mode 100644
index d00dc9862..000000000
--- a/application/language/Spanish/module_lang.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-$lang['module_home']='Inicio';
-
-$lang['module_customers']='Clientes';
-$lang['module_customers_desc']='Agregar, Actualizar, Borrar y Buscar clientes';
-
-$lang['module_suppliers']='Proveedores';
-$lang['module_suppliers_desc']='Agregar, Actualizar, Borrar y Buscar proveedores';
-
-$lang['module_employees']='Empleados';
-$lang['module_employees_desc']='Agregar, Actualizar, Borrar y Buscar empleados';
-
-$lang['module_sales']='Ventas';
-$lang['module_sales_desc']='Procesar ventas y reintegros';
-
-$lang['module_reports']='Reportes';
-$lang['module_reports_desc']='Ver y generar reportes';
-
-$lang['module_items']='Artículos';
-$lang['module_items_desc']='Agregar, Actualizar, Borrar y Buscar artículos';
-
-$lang['module_config']='Configuración de la Tienda';
-$lang['module_config_desc']='Cambiar la configuración de la tienda';
-
-$lang['module_receivings']='Receivings';
-$lang['module_receivings_desc']='Process Purchase orders';
-
-$lang['module_giftcards']='Tarjetas de Regalo';
-$lang['module_giftcards_desc']='Agregar, Actualizar, Borrar y Buscar Tarjetas de Regalo';
-
-$lang['module_item_kits']='Kits de Artículos';
-$lang['module_item_kits_desc']='Agregar, Actualizar, Borrar y Buscar Kits de Artículos';
-?>
diff --git a/application/language/Spanish/receivings_lang.php b/application/language/Spanish/receivings_lang.php
deleted file mode 100644
index e86080793..000000000
--- a/application/language/Spanish/receivings_lang.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-$lang['recvs_register']='Entrada de Artículos';
-$lang['recvs_mode']='Modo de Entradas';
-$lang['recvs_receiving']='Recibir';
-$lang['recvs_return']='Regresar';
-$lang['recvs_total']='Total';
-$lang['recvs_cost']='Costo';
-$lang['recvs_quantity']='Cant.';
-$lang['recvs_discount']='Desc %';
-$lang['recvs_edit']='Editar';
-$lang['recvs_new_supplier'] = 'Nuevo Proveedor';
-$lang['recvs_supplier'] = 'Proveedor';
-$lang['recvs_select_supplier']='Seleccionar Proveedor (Opcional)';
-$lang['recvs_start_typing_supplier_name']='Empieza a escribir el nombre del proveedor...';
-$lang['recvs_unable_to_add_item']='No pude agregar el artículo a la entrada';
-$lang['recvs_error_editing_item']='Error al editar artículo';
-$lang['recvs_receipt']='Recibo de Entrada';
-$lang['recvs_complete_receiving']='Terminar';
-$lang['recvs_confirm_finish_receiving'] = '¿Estás seguro(a) de querer procesar esta entrada? Ésto no puede ser des-hecho.';
-$lang['recvs_confirm_cancel_receiving'] = '¿Estás seguro(a) de querer limpiar esta entrada? Todos los artículos serán limpiados.';
-$lang['recvs_find_or_scan_item']='Encontrar/Escanear Artículo';
-$lang['recvs_find_or_scan_item_or_receipt']='Encontrar/Escanear Artículo o Entrada';
-$lang['recvs_id']='ID de Entrada';
-$lang['recvs_item_name'] = 'Nombre del Artículo';
-$lang['receivings_transaction_failed'] = 'Las Transacciones de Entrada Fallaron';
-?>
diff --git a/application/language/Spanish/suppliers_lang.php b/application/language/Spanish/suppliers_lang.php
deleted file mode 100644
index c2a436b1e..000000000
--- a/application/language/Spanish/suppliers_lang.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-$lang['suppliers_new']='Nuevo Proveedor';
-$lang['suppliers_supplier']='Proveedor';
-$lang['suppliers_update']='Actualizar Proveedor';
-$lang['suppliers_confirm_delete']='Estás seguro(a) de querer borrar a los proveedores seleccionados?';
-$lang['suppliers_none_selected']='No has seleccionado proveedores para borrar';
-$lang['suppliers_error_adding_updating'] = 'Error agregando/actualizando proveedor';
-$lang['suppliers_successful_adding']='Has agregado al proveedor satisfactoriamente';
-$lang['suppliers_successful_updating']='Has actualizado al proveedor satisfactoriamente';
-$lang['suppliers_successful_deleted']='Has borrado satisfactoriamente a';
-$lang['suppliers_one_or_multiple']='proveedor(es)';
-$lang['suppliers_cannot_be_deleted']='No se pudo borrar a los proveedores seleccionados. Uno o más de los seleccionadostiene ventas.';
-$lang['suppliers_basic_information']='Información de Proveedores';
-$lang['suppliers_account_number']='Cuenta #';
-$lang['suppliers_company_name']='Nombre de la Compañía';
-$lang['suppliers_company_name_required'] = 'Nombre de la Compañía es requerido';
-?>
diff --git a/application/language/dutch/config_lang.php b/application/language/dutch/config_lang.php
deleted file mode 100755
index e280ccf21..000000000
--- a/application/language/dutch/config_lang.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-$lang['config_info']='Configuratie Informatie';
-$lang['config_company']='Bedrijfsnaam';
-$lang['config_address']='Adres';
-$lang['config_phone']='Telefoon';
-$lang['config_website']='Website';
-$lang['config_fax']='Fax';
-$lang['config_default_tax_rate']='Standaard VAT %';
-$lang['config_default_tax_rate_1']='VAT 1 %';
-$lang['config_default_tax_rate_2']='VAT 2 %';
-$lang['config_company_required']='De bedrijfsnaam moet ingevuld worden';
-$lang['config_address_required']='Het adres van het bedrijf moet ingevuld worden';
-$lang['config_phone_required']='De telefoonnummer van het bedrijf moet ingevuld worden';
-$lang['config_default_tax_rate_required']='Het percentage VAT moet ingevuld worden';
-$lang['config_default_tax_rate_number']='Het percentage VAT moet een nummer zijn';
-$lang['config_company_website_url']='De website van het bedrijf is geen geldige URL (http://...)';
-$lang['config_saved_successfully']='Configuratie werd bewaard';
-$lang['config_saved_unsuccessfully']='Configuratie kon niet worden bewaard';
-$lang['config_return_policy_required']='De retourvoorwaarden moeten ingevuld worden';
-$lang['config_print_after_sale']='Druk ticket na verkoop';
-$lang['config_language'] = 'Taal';
-$lang['config_timezone'] = 'Tijdzone';
-$lang['config_currency_symbol'] = 'Valuta';
-$lang['config_currency_side'] = 'Rechterkant'; //GARRISON ADDED 4/20/2013
-$lang['config_custom1'] = 'Custom Veld 1'; //GARRISON ADDED 4/21/2013
-$lang['config_custom2'] = 'Custom Veld 2'; //GARRISON ADDED 4/21/2013
-$lang['config_custom3'] = 'Custom Veld 3'; //GARRISON ADDED 4/21/2013
-$lang['config_custom4'] = 'Custom Veld 4'; //GARRISON ADDED 4/21/2013
-$lang['config_custom5'] = 'Custom Veld 5'; //GARRISON ADDED 4/21/2013
-$lang['config_custom6'] = 'Custom Veld 6'; //GARRISON ADDED 4/21/2013
-$lang['config_custom7'] = 'Custom Veld 7'; //GARRISON ADDED 4/21/2013
-$lang['config_custom8'] = 'Custom Veld 8'; //GARRISON ADDED 4/21/2013
-$lang['config_custom9'] = 'Custom Veld 9'; //GARRISON ADDED 4/21/2013
-$lang['config_custom10'] = 'Custom Veld 10'; //GARRISON ADDED 4/21/2013
-?>
\ No newline at end of file
diff --git a/application/language/dutch/giftcards_lang.php b/application/language/dutch/giftcards_lang.php
deleted file mode 100644
index c3b61315f..000000000
--- a/application/language/dutch/giftcards_lang.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-$lang['giftcards_giftcard_number']='Cadeaubon Nummer';
-$lang['giftcards_card_value']='Waarde';
-$lang['giftcards_basic_information']='Cadeaubon Info';
-$lang['giftcards_number_required']='Cadeaubon Nummer is een verplicht veld';
-$lang['giftcards_value_required']='Cadeaubon Waarde is een verplicht veld';
-$lang['giftcards_number']='Cadeaubon Nummer moet een getal zijn';
-$lang['giftcards_value']='Cadeaubon Waarde moet een getal zijn';
-$lang['giftcards_person_id']='Klant';
-
-$lang['giftcards_retrive_giftcard_info']='Haal Info Op';
-$lang['giftcards_description']='Omschrijving';
-$lang['giftcards_amazon']='Amazon';
-$lang['giftcards_upc_database']='UPC Database';
-$lang['giftcards_cannot_find_giftcard']='Kan geen cadeaubon niet vinden';
-$lang['giftcards_info_provided_by']='Info afgeleverd door';
-$lang['giftcards_number_information']='Cadeaubon Nummer';
-$lang['giftcards_new']='Nieuwe Cadeaubon';
-$lang['giftcards_update']='Bewaar Cadeaubon';
-$lang['giftcards_giftcard']='Cadeaubon';
-$lang['giftcards_edit_multiple_giftcards']='Bewerk meedere cadeaubons';
-$lang['giftcards_category']='Categorie';
-$lang['giftcards_cost_price']='Aankoopprijs';
-$lang['giftcards_unit_price']='Verkoopsprijs';
-$lang['giftcards_tax_1']='VAT';
-$lang['giftcards_tax_2']='VAT 2';
-$lang['giftcards_sales_tax_1'] = 'VAT';
-$lang['giftcards_sales_tax_2'] = 'VAT 2';
-$lang['giftcards_tax_percent']='VAT %';
-$lang['giftcards_tax_percents']='VAT Percentages';
-$lang['giftcards_reorder_level']='Reorder Level';
-$lang['giftcards_quantity']='In stock';
-$lang['giftcards_no_giftcards_to_display']='Er werden geen cadeaubons gevonden';
-$lang['giftcards_bulk_edit']='Bewerk Selectie';
-$lang['giftcards_confirm_delete']='Bent u zeker dat u de geselecteerde cadeaubons wil verwijderen?';
-$lang['giftcards_none_selected']='U hebt geen cadeaubons geselecteerd';
-$lang['giftcards_confirm_bulk_edit']='Bent u zeker dat u de geselecteerde cadeaubons wil aanpassen?';
-$lang['giftcards_successful_bulk_edit']='Cadeaubons werden succesvol bewaard';
-$lang['giftcards_error_updating_multiple']='Fout bij het bewaren van cadeaubons';
-$lang['giftcards_edit_fields_you_want_to_update']='Bewerk de velden die u wil aanpassen voor ALLE geselecteerde cadeaubons';
-$lang['giftcards_error_adding_updating'] = 'Fout bij het bewaren van cadeaubons';
-$lang['giftcards_successful_adding']='Cadeaubon succesvol toegevoegd';
-$lang['giftcards_successful_updating']='Wijzigingen bewaard voor';
-$lang['giftcards_successful_deleted']='Er werd(en)';
-$lang['giftcards_one_or_multiple']='cadeaubon(s) verwijderd';
-$lang['giftcards_cannot_be_deleted']='De cadeaubons konden niet worden verwijderd.';
-$lang['giftcards_none'] = 'Geen';
-$lang['giftcards_supplier'] = 'Leverancier';
-$lang['giftcards_generate_barcodes'] = 'Genereer Barcodes';
-$lang['giftcards_must_select_giftcard_for_barcode'] = 'U moet tenminste 1 cadeuabon selecteren om een barcode te genereren';
-$lang['giftcards_excel_import_failed'] = 'Excel import mislukt';
-$lang['giftcards_allow_alt_desciption'] = 'Aanpasbare omschrijving';
-$lang['giftcards_is_serialized'] = 'Optelbaar';
-$lang['giftcards_low_inventory_giftcards'] = 'Cadeaubons niet in stock';
-$lang['giftcards_serialized_giftcards'] = 'Optelbare cadeaubons';
-$lang['giftcards_no_description_giftcards'] = 'Cadeaubons zonder omschrijving';
-$lang['giftcards_inventory_comments']='Commentaar';
-$lang['giftcards_count']='Update Stock';
-$lang['giftcards_details_count']='Stockgegevens';
-$lang['giftcards_add_minus']='Corrigatie hoeveelheid';
-$lang['giftcards_current_quantity']='Huidige hoeveelheid';
-$lang['giftcards_quantity_required']='Hoeveelheid moet ingevuld worden. Druk Sluit ( X ) om te annuleren';
-$lang['giftcards_do_nothing'] = 'Doe niets';
-$lang['giftcards_change_all_to_serialized'] = 'Genummerd';
-$lang['giftcards_change_all_to_unserialized'] = 'Niet genummerd';
-$lang['giftcards_change_all_to_allow_alt_desc'] = 'Aanpasb. omschrijvingen';
-$lang['giftcards_change_all_to_not_allow_allow_desc'] = 'Vast omschrijvingen';
-$lang['giftcards_use_inventory_menu'] = 'Use Inv. Menu';
-$lang['giftcards_manually_editing_of_quantity'] = 'Manuele aanpassing hoeveelheid';
-?>
diff --git a/application/language/dutch/items_lang.php b/application/language/dutch/items_lang.php
deleted file mode 100755
index 36f0ebe67..000000000
--- a/application/language/dutch/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/dutch/login_lang.php b/application/language/dutch/login_lang.php
deleted file mode 100755
index 3f624eedd..000000000
--- a/application/language/dutch/login_lang.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$lang['login_login']='Login';
-$lang['login_username']='Gebruiker';
-$lang['login_password']='Paswoord';
-$lang['login_go']='Verstuur';
-$lang['login_invalid_username_and_password']='Ongeldige gebruiker/paswoord';
-$lang['login_welcome_message']='Welkom in deze module. Voer gebruikersnaam en paswoord in om verder te gaan.';
-?>
diff --git a/application/language/dutch/module_lang.php b/application/language/dutch/module_lang.php
deleted file mode 100755
index 69d8afe62..000000000
--- a/application/language/dutch/module_lang.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-$lang['module_home']='Home';
-
-$lang['module_customers']='Klanten';
-$lang['module_customers_desc']='Zoek, bewerk, verwijder en voeg klanten toe';
-
-$lang['module_suppliers']='Leveranciers';
-$lang['module_suppliers_desc']='Zoek, bewerk, verwijder en voeg leveranciers toe';
-
-$lang['module_employees']='Werknemers';
-$lang['module_employees_desc']='Zoek, bewerk, verwijder en voeg werknemers toe';
-
-$lang['module_sales']='Kassa';
-$lang['module_sales_desc']='Verwerk aankopen en retours';
-
-$lang['module_reports']='Rapporten';
-$lang['module_reports_desc']='Toon en genereer rapporten';
-
-$lang['module_items']='Producten';
-$lang['module_items_desc']='Zoek, bewerk, verwijder en voeg producten toe';
-
-$lang['module_config']='Configuratie';
-$lang['module_config_desc']='Globale configuratie aanpassen';
-
-$lang['module_receivings']='Orders';
-$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';
-
-?>
diff --git a/application/language/dutch/receivings_lang.php b/application/language/dutch/receivings_lang.php
deleted file mode 100755
index 96d199d70..000000000
--- a/application/language/dutch/receivings_lang.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-$lang['recvs_register']='Orders';
-$lang['recvs_mode']='Order type';
-$lang['recvs_receiving']='Inkoop';
-$lang['recvs_return']='Teruggave';
-$lang['recvs_total']='Totaal';
-$lang['recvs_cost']='Kost';
-$lang['recvs_quantity']='Aantal';
-$lang['recvs_discount']='Korting %';
-$lang['recvs_edit']='Bewerk';
-$lang['recvs_new_supplier'] = 'N. Leverancier';
-$lang['recvs_supplier'] = 'Leverancier';
-$lang['recvs_select_supplier']='Selecteer Leverancier (Optioneel)';
-$lang['recvs_start_typing_supplier_name']='Typ naam leverancier..';
-$lang['recvs_unable_to_add_item']='Onmogelijk om product aan order toe te voegen';
-$lang['recvs_error_editing_item']='Fout bij het bewerken product';
-$lang['recvs_receipt']='Ontvangstbewijs';
-$lang['recvs_complete_receiving']='Bevestig';
-$lang['recvs_confirm_finish_receiving'] = 'Bent u zeker dat u dit order wil ingeven? Dit kan niet ongedaan gemaakt worden.';
-$lang['recvs_confirm_cancel_receiving'] = 'Bent u zeker dat u dit order wil wissen?';
-$lang['recvs_find_or_scan_item']='Zoek/Scan Product';
-$lang['recvs_find_or_scan_item_or_receipt']='Zoek/Scan Product OF Tickets';
-$lang['recvs_id']='Ordernummer';
-$lang['recvs_item_name'] = 'Productnaam';
-$lang['receivings_transaction_failed'] = 'Order transactie mislukt';
-?>
diff --git a/application/language/Azerbaijan/common_lang.php b/application/language/en/common_lang.php
similarity index 100%
rename from application/language/Azerbaijan/common_lang.php
rename to application/language/en/common_lang.php
diff --git a/application/language/Azerbaijan/config_lang.php b/application/language/en/config_lang.php
similarity index 100%
rename from application/language/Azerbaijan/config_lang.php
rename to application/language/en/config_lang.php
diff --git a/application/language/Azerbaijan/customers_lang.php b/application/language/en/customers_lang.php
similarity index 100%
rename from application/language/Azerbaijan/customers_lang.php
rename to application/language/en/customers_lang.php
diff --git a/application/language/Azerbaijan/employees_lang.php b/application/language/en/employees_lang.php
similarity index 100%
rename from application/language/Azerbaijan/employees_lang.php
rename to application/language/en/employees_lang.php
diff --git a/application/language/Azerbaijan/error_lang.php b/application/language/en/error_lang.php
similarity index 100%
rename from application/language/Azerbaijan/error_lang.php
rename to application/language/en/error_lang.php
diff --git a/application/language/en/form_validation_lang.php b/application/language/en/form_validation_lang.php
new file mode 100644
index 000000000..3418f29ab
--- /dev/null
+++ b/application/language/en/form_validation_lang.php
@@ -0,0 +1,29 @@
+<?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/application/language/Azerbaijan/giftcards_lang.php b/application/language/en/giftcards_lang.php
similarity index 98%
rename from application/language/Azerbaijan/giftcards_lang.php
rename to application/language/en/giftcards_lang.php
index edd7fc95b..cfd96a74e 100644
--- a/application/language/Azerbaijan/giftcards_lang.php
+++ b/application/language/en/giftcards_lang.php
@@ -8,7 +8,7 @@ $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']='Retrive Giftcard Info';
+$lang['giftcards_retrive_giftcard_info']='Retrieve Giftcard Info';
 $lang['giftcards_description']='Description';
 $lang['giftcards_amazon']='Amazon';
 $lang['giftcards_upc_database']='UPC Database';
diff --git a/application/language/Azerbaijan/index.html b/application/language/en/index.html
similarity index 100%
rename from application/language/Azerbaijan/index.html
rename to application/language/en/index.html
diff --git a/application/language/Azerbaijan/item_kits_lang.php b/application/language/en/item_kits_lang.php
similarity index 100%
rename from application/language/Azerbaijan/item_kits_lang.php
rename to application/language/en/item_kits_lang.php
diff --git a/application/language/Azerbaijan/items_lang.php b/application/language/en/items_lang.php
similarity index 93%
rename from application/language/Azerbaijan/items_lang.php
rename to application/language/en/items_lang.php
index c0ed72e0a..7535f42bb 100644
--- a/application/language/Azerbaijan/items_lang.php
+++ b/application/language/en/items_lang.php
@@ -41,9 +41,9 @@ $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']='Buy price is a required field';
-$lang['items_unit_price_required']='Selling Price is a required field';
-$lang['items_cost_price_required']='Cost Price 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';
diff --git a/application/language/Azerbaijan/login_lang.php b/application/language/en/login_lang.php
similarity index 100%
rename from application/language/Azerbaijan/login_lang.php
rename to application/language/en/login_lang.php
diff --git a/application/language/Azerbaijan/module_lang.php b/application/language/en/module_lang.php
similarity index 100%
rename from application/language/Azerbaijan/module_lang.php
rename to application/language/en/module_lang.php
diff --git a/application/language/Azerbaijan/receivings_lang.php b/application/language/en/receivings_lang.php
similarity index 100%
rename from application/language/Azerbaijan/receivings_lang.php
rename to application/language/en/receivings_lang.php
diff --git a/application/language/Azerbaijan/reports_lang.php b/application/language/en/reports_lang.php
similarity index 97%
rename from application/language/Azerbaijan/reports_lang.php
rename to application/language/en/reports_lang.php
index 12e1f3598..e41d34242 100644
--- a/application/language/Azerbaijan/reports_lang.php
+++ b/application/language/en/reports_lang.php
@@ -28,7 +28,9 @@ $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';
diff --git a/application/language/Azerbaijan/sales_lang.php b/application/language/en/sales_lang.php
similarity index 96%
rename from application/language/Azerbaijan/sales_lang.php
rename to application/language/en/sales_lang.php
index 836446372..dc39c937f 100644
--- a/application/language/Azerbaijan/sales_lang.php
+++ b/application/language/en/sales_lang.php
@@ -14,7 +14,11 @@ $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';
diff --git a/application/language/Azerbaijan/suppliers_lang.php b/application/language/en/suppliers_lang.php
similarity index 100%
rename from application/language/Azerbaijan/suppliers_lang.php
rename to application/language/en/suppliers_lang.php
diff --git a/application/language/english/common_lang.php b/application/language/english/common_lang.php
index 3ddf42837..5b430fd63 100644
--- a/application/language/english/common_lang.php
+++ b/application/language/english/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/english/config_lang.php b/application/language/english/config_lang.php
index 6c7686880..b0c3f02f9 100644
--- a/application/language/english/config_lang.php
+++ b/application/language/english/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';
@@ -32,4 +32,5 @@ $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
index d6978d458..3f8804144 100644
--- a/application/language/english/customers_lang.php
+++ b/application/language/english/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/english/employees_lang.php b/application/language/english/employees_lang.php
index a30c32b99..5f77c5a85 100644
--- a/application/language/english/employees_lang.php
+++ b/application/language/english/employees_lang.php
@@ -1,27 +1,27 @@
 <?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/english/error_lang.php b/application/language/english/error_lang.php
index cfcd2f0c9..c7c178e9f 100644
--- a/application/language/english/error_lang.php
+++ b/application/language/english/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';
+?>
\ No newline at end of file
diff --git a/application/language/english/form_validation_lang.php b/application/language/english/form_validation_lang.php
new file mode 100644
index 000000000..3418f29ab
--- /dev/null
+++ b/application/language/english/form_validation_lang.php
@@ -0,0 +1,29 @@
+<?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/application/language/english/giftcards_lang.php b/application/language/english/giftcards_lang.php
index cfd96a74e..5bb1766be 100644
--- a/application/language/english/giftcards_lang.php
+++ b/application/language/english/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';
@@ -67,4 +66,4 @@ $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/items_lang.php b/application/language/english/items_lang.php
index 7535f42bb..2f5b7b03c 100644
--- a/application/language/english/items_lang.php
+++ b/application/language/english/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
+?>
\ No newline at end of file
diff --git a/application/language/english/login_lang.php b/application/language/english/login_lang.php
index a5aa1bb26..db5f2753e 100644
--- a/application/language/english/login_lang.php
+++ b/application/language/english/login_lang.php
@@ -1,8 +1,8 @@
 <?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.';
+$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
index 9e95a2d81..d45a4b6b4 100644
--- a/application/language/english/module_lang.php
+++ b/application/language/english/module_lang.php
@@ -1,34 +1,34 @@
 <?php
-$lang['module_home']='Home';
+$lang['module_home'] = 'Home';
 
-$lang['module_customers']='Customers';
-$lang['module_customers_desc']='Add, Update, Delete, and Search customers';
+$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_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_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_sales'] = 'Sales';
+$lang['module_sales_desc'] = 'Process sales and returns';
 
-$lang['module_reports']='Reports';
-$lang['module_reports_desc']='View and generate reports';
+$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_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_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_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_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';
+$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
index 2564d4d42..efeb84355 100644
--- a/application/language/english/receivings_lang.php
+++ b/application/language/english/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/english/reports_lang.php b/application/language/english/reports_lang.php
index e41d34242..b37841815 100644
--- a/application/language/english/reports_lang.php
+++ b/application/language/english/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'] = '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
index dc39c937f..ee82b2be7 100644
--- a/application/language/english/sales_lang.php
+++ b/application/language/english/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';
@@ -66,7 +62,6 @@ $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_date'] = 'Sale Date';
 $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';
@@ -74,10 +69,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/english/suppliers_lang.php b/application/language/english/suppliers_lang.php
index 97191a352..6745f1e6c 100644
--- a/application/language/english/suppliers_lang.php
+++ b/application/language/english/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';
-?>
+?>
\ No newline at end of file
diff --git a/application/language/es/common_lang.php b/application/language/es/common_lang.php
new file mode 100644
index 000000000..d05cd1dc1
--- /dev/null
+++ b/application/language/es/common_lang.php
@@ -0,0 +1,41 @@
+<?php
+$lang['common_common'] = 'común';
+$lang['common_submit'] = 'Enviar';
+$lang['common_or'] = 'Ó';
+$lang['common_powered_by'] = 'Potenciado por';
+$lang['common_welcome'] = 'Bienvenido(a)';
+$lang['common_logout'] = 'Salir';
+$lang['common_list_of'] = 'Lista de';
+$lang['common_first_name'] = 'Nombre';
+$lang['common_last_name'] = 'Apellidos';
+$lang['common_email'] = 'E-Mail';
+$lang['common_phone_number'] = 'Teléfono';
+$lang['common_address_1'] = 'Dirección 1';
+$lang['common_address_2'] = 'Dirección 2';
+$lang['common_city'] = 'Ciudad';
+$lang['common_state'] = 'Estado';
+$lang['common_zip'] = 'C.P.';
+$lang['common_country'] = 'País';
+$lang['common_comments'] = 'Comentarios';
+$lang['common_edit'] = 'editar';
+$lang['common_search'] = 'Buscar';
+$lang['common_delete'] = 'Borrar';
+$lang['common_remove'] = 'Eliminar';
+$lang['common_view_recent_sales'] = 'Ver Ventas Recientes';
+$lang['common_you_are_using_ospos'] = 'Estás usando Open Source Point Of Sale Versión';
+$lang['common_please_visit_my'] = 'Por favor, visita mi';
+$lang['common_website'] = 'sitio';
+$lang['common_fields_required_message'] = 'Los campos en rojo son requeridos';
+$lang['common_learn_about_project'] = 'para leer la información más reciente acerca del proyecto';
+$lang['common_searched_for'] = 'Buscaste';
+$lang['common_first_name_required'] = 'Nombre es un campo requerido';
+$lang['common_last_name_required'] = 'Apellidos es un campo requerido';
+$lang['common_email_invalid_format'] = 'El e-mail no está en el formato requerido';
+$lang['common_confirm_search'] = 'Has seleccionado una o más filas. Éstas no estarán seleccionadas después de tu búsqueda. ¿Seguro(a) que quieres hacer esta búsqueda?';
+$lang['common_no_persons_to_display'] = 'No hay gente que mostrar';
+$lang['common_return_policy'] = 'Política de Devolución';
+$lang['common_price'] = 'Precio';
+$lang['common_welcome_message']= 'Bienvenido(a) a Open Source Point Of Sale. ¡Haz click en algún módulo debajo, para empezar!';
+$lang['common_inv'] = 'inv';
+$lang['common_det'] = 'detalles';
+?>
\ No newline at end of file
diff --git a/application/language/es/config_lang.php b/application/language/es/config_lang.php
new file mode 100644
index 000000000..80c6bc951
--- /dev/null
+++ b/application/language/es/config_lang.php
@@ -0,0 +1,36 @@
+<?php
+$lang['config_info'] = 'Información del Comercio';
+$lang['config_company'] = 'Nombre del Comercio';
+$lang['config_address'] = 'Dirección del Comercio';
+$lang['config_phone'] = 'Teléfono del Comercio';
+$lang['config_website'] = 'Sitio Web';
+$lang['config_fax'] = 'Fax';
+$lang['config_default_tax_rate'] = '% de Impuestos Predeterminada';
+$lang['config_default_tax_rate_1'] = 'Impuesto 1';
+$lang['config_default_tax_rate_2'] = 'Impuesto 2';
+$lang['config_company_required'] = 'Nombre del Comercio es requerido';
+$lang['config_address_required'] = 'Dirección del Comercio es requerida';
+$lang['config_phone_required'] = 'Teléfono del Comercio es requerido';
+$lang['config_default_tax_rate_required'] = 'El Impuesto Predeterminado es requerido';
+$lang['config_default_tax_rate_number'] = 'El Impuesto Predeterminado debe ser un número';
+$lang['config_company_website_url'] = 'Sitio Web no es una URL estándard (http://...)';
+$lang['config_saved_successfully'] = 'Configuración guardada satisfactoriamente';
+$lang['config_saved_unsuccessfully'] = 'Configuración no guardada';
+$lang['config_return_policy_required'] = 'Política de Devolución es requerida';
+$lang['config_print_after_sale'] = 'Imprimir recibo después de una venta';
+$lang['config_language'] = 'Idioma';
+$lang['config_timezone'] = 'Zona Horaria';
+$lang['config_currency_symbol'] = 'Símbolo de divisa';
+$lang['config_currency_side'] = 'Lado derecho'; //GARRISON ADDED 4/20/2013
+$lang['config_custom1'] = 'Campo Libre 1'; //GARRISON ADDED 4/21/2013
+$lang['config_custom2'] = 'Campo Libre 2'; //GARRISON ADDED 4/21/2013
+$lang['config_custom3'] = 'Campo Libre 3'; //GARRISON ADDED 4/21/2013
+$lang['config_custom4'] = 'Campo Libre 4'; //GARRISON ADDED 4/21/2013
+$lang['config_custom5'] = 'Campo Libre 5'; //GARRISON ADDED 4/21/2013
+$lang['config_custom6'] = 'Campo Libre 6'; //GARRISON ADDED 4/21/2013
+$lang['config_custom7'] = 'Campo Libre 7'; //GARRISON ADDED 4/21/2013
+$lang['config_custom8'] = 'Campo Libre 8'; //GARRISON ADDED 4/21/2013
+$lang['config_custom9'] = 'Campo Libre 9'; //GARRISON ADDED 4/21/2013
+$lang['config_custom10'] = 'Campo Libre 10'; //GARRISON ADDED 4/21/2013
+$lang['config_tax_included'] = 'Impuestos incluidos';
+?>
diff --git a/application/language/es/customers_lang.php b/application/language/es/customers_lang.php
new file mode 100644
index 000000000..2c20d3c92
--- /dev/null
+++ b/application/language/es/customers_lang.php
@@ -0,0 +1,16 @@
+<?php
+$lang['customers_new'] = 'Nuevo Cliente';
+$lang['customers_customer'] = 'Cliente';
+$lang['customers_update'] = 'Actualizar Cliente';
+$lang['customers_confirm_delete'] = '¿Estás seguro(a) de que quieres borrar a los clientes seleccionados?';
+$lang['customers_none_selected'] = 'No has selccionado clientes para ser borrados';
+$lang['customers_error_adding_updating'] = 'Error agregando/actualizando cliente';
+$lang['customers_successful_adding'] = 'Has agregado satisfactoriamente el cliente';
+$lang['customers_successful_updating'] = 'No se ha podido agregar el cliente';
+$lang['customers_successful_deleted'] = 'Has borrado satisfactoriamente a';
+$lang['customers_one_or_multiple'] = 'cliente(s)';
+$lang['customers_cannot_be_deleted'] = 'No se pudo borrar los clientes seleccionados. Uno o más de éstos tiene ventas.';
+$lang['customers_basic_information'] = 'Información de Clientes';
+$lang['customers_account_number'] = 'Cuenta #';
+$lang['customers_taxable'] = 'Gravable';
+?>
diff --git a/application/language/es/employees_lang.php b/application/language/es/employees_lang.php
new file mode 100644
index 000000000..172f7afe2
--- /dev/null
+++ b/application/language/es/employees_lang.php
@@ -0,0 +1,27 @@
+<?php
+$lang['employees_employee'] = 'Empleado';
+$lang['employees_new'] = 'Nuevo Empleado';
+$lang['employees_update'] = 'Actualizar Empleado';
+$lang['employees_confirm_delete'] = '¿Estás seguro(a) que quieres borrar los empleados seleccionados?';
+$lang['employees_none_selected'] = 'No has seleccionado empleados para borrar';
+$lang['employees_error_adding_updating'] = 'Error al agregar/actualizar empleado';
+$lang['employees_successful_adding'] = 'Has agregado el empleado satisfactoriamente';
+$lang['employees_successful_updating'] = 'Has actualizado el empleado satisfactoriamente';
+$lang['employees_successful_deleted'] = 'Has borrado satisfactoriamente a';
+$lang['employees_one_or_multiple'] = 'empleado(s)';
+$lang['employees_cannot_be_deleted'] = 'No se pudieron borrar empleados. Uno o más empleados tiene ventas procesadas o estás tratando de borrarte a tí mismo(a).';
+$lang['employees_username'] = 'Usuario';
+$lang['employees_password'] = 'Contraseña';
+$lang['employees_repeat_password'] = 'Repita Contraseña';
+$lang['employees_username_required'] = 'Usuario es requerido';
+$lang['employees_username_minlength'] = 'El Usuario debe tener, por lo menos, 5 caracteres';
+$lang['employees_password_required'] = 'La Contraseña es requerida';
+$lang['employees_password_minlength'] = 'La contraseña debe tener, por lo menos, 8 caracteres';
+$lang['employees_password_must_match'] = 'Las Contraseñas no coinciden';
+$lang['employees_basic_information'] = 'Información Básica de Empleados';
+$lang['employees_login_info'] = 'Información de Ingreso del Empleado';
+$lang['employees_permission_info'] = 'Permisos y Acceso del Empleado';
+$lang['employees_permission_desc'] = 'Activa las cajas debajo para permitir el acceso a los módulos';
+$lang['employees_error_updating_demo_admin'] = 'No puedes cambiar el usuario admin del demo';
+$lang['employees_error_deleting_demo_admin'] = 'No puedes borrar el usuario admin del demo';
+?>
diff --git a/application/language/es/error_lang.php b/application/language/es/error_lang.php
new file mode 100644
index 000000000..0e0425c66
--- /dev/null
+++ b/application/language/es/error_lang.php
@@ -0,0 +1,4 @@
+<?php
+$lang['error_no_permission_module'] = 'No tienes permiso para accesar el módulo llamado';
+$lang['error_unknown'] = 'desconocido';
+?>
\ No newline at end of file
diff --git a/application/language/es/form_validation_lang.php b/application/language/es/form_validation_lang.php
new file mode 100644
index 000000000..3418f29ab
--- /dev/null
+++ b/application/language/es/form_validation_lang.php
@@ -0,0 +1,29 @@
+<?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/application/language/es/giftcards_lang.php b/application/language/es/giftcards_lang.php
new file mode 100644
index 000000000..38122406c
--- /dev/null
+++ b/application/language/es/giftcards_lang.php
@@ -0,0 +1,69 @@
+<?php
+$lang['giftcards_giftcard_number'] = 'Número de Tarjeta de Regalo';
+$lang['giftcards_card_value'] = 'Valor';
+$lang['giftcards_basic_information'] = 'Información de Tarjeta de Regalo';
+$lang['giftcards_number_required'] = 'Número de Tarjeta de Regalo es requerido';
+$lang['giftcards_value_required'] = 'Valor de Tarjeta de Regalo es requerido';
+$lang['giftcards_number'] = 'Número de Tarjeta de Regalo debe ser un número';
+$lang['giftcards_value'] = 'Valor de Tarjeta de Regalo debe ser un número';
+$lang['giftcards_person_id'] = 'Customer';
+$lang['giftcards_retrive_giftcard_info'] = 'Obtener Info de Tarjeta de Regalo';
+$lang['giftcards_description'] = 'Descripción';
+$lang['giftcards_amazon'] = 'Amazon';
+$lang['giftcards_upc_database'] = 'Base de Datos UPC';
+$lang['giftcards_cannot_find_giftcard'] = 'No puedo encontrar información acerca de la tarjeta de regalo';
+$lang['giftcards_info_provided_by'] = 'Info provista por';
+$lang['giftcards_number_information'] = 'Número de Tarjeta de Regalo';
+$lang['giftcards_new'] = 'Nueva Tarjeta de Regalo';
+$lang['giftcards_update'] = 'Actualizar Tarjeta de Regalo';
+$lang['giftcards_giftcard'] = 'Tarjeta de Regalo';
+$lang['giftcards_edit_multiple_giftcards'] = 'Editando Múltiples Tarjetas de Regalo';
+$lang['giftcards_category'] = 'Categoría';
+$lang['giftcards_cost_price'] = 'Precio de Costo';
+$lang['giftcards_unit_price'] = 'Precio Unitario';
+$lang['giftcards_tax_1'] = 'Impuesto 1';
+$lang['giftcards_tax_2'] = 'Impuesto 2';
+$lang['giftcards_sales_tax_1'] = 'Impuesto de Venta 1';
+$lang['giftcards_sales_tax_2'] = 'Impuesto de Venta 2';
+$lang['giftcards_tax_percent'] = 'Porcentaje de Impuesto';
+$lang['giftcards_tax_percents'] = 'Porcentaje de Impuesto(s)';
+$lang['giftcards_reorder_level'] = 'Cantidad Mínima';
+$lang['giftcards_quantity'] = 'Cantidad';
+$lang['giftcards_no_giftcards_to_display'] = 'No hay Tarjetas de Regalo';
+$lang['giftcards_bulk_edit'] = 'Edición Múltiple';
+$lang['giftcards_confirm_delete'] = '¿Estás seguro(a) de querer eliminar las tarjetas de regalo seleccionadas?';
+$lang['giftcards_none_selected'] = 'No has seleccionado tarjetas de regalo para editar';
+$lang['giftcards_confirm_bulk_edit'] = '¿Estás seguro(a) de querer editar las tarjetas de regalo seleccionadas?';
+$lang['giftcards_successful_bulk_edit'] = 'Has actualizado satisfactoriamente las tarjetas de regalo seleccionadas';
+$lang['giftcards_error_updating_multiple'] = 'Error actualizando tarjetas de regalo';
+$lang['giftcards_edit_fields_you_want_to_update'] = 'Edita los campos que quieras actualizar en TODAS las tarjetas de regalo seleccionadas';
+$lang['giftcards_error_adding_updating'] = 'Error agregando/actualizando tarjeta de regalo';
+$lang['giftcards_successful_adding'] = 'Has agregado satisfactoriamente una tarjeta de regalo';
+$lang['giftcards_successful_updating'] = 'Has actualizado satisfactoriamente una tarjeta de regalo';
+$lang['giftcards_successful_deleted'] = 'Has borrado satisfactoriamente';
+$lang['giftcards_one_or_multiple'] = 'tarjeta(s) de regalo';
+$lang['giftcards_cannot_be_deleted'] = 'No se puede borrar las tarjetas seleccionadas. Una o más tiene ventas.';
+$lang['giftcards_none'] = 'Ninguno(a)';
+$lang['giftcards_supplier'] = 'Proveedor';
+$lang['giftcards_generate_barcodes'] = 'Generar Códigos de Barras';
+$lang['giftcards_must_select_giftcard_for_barcode'] = 'Debes seleccionar por lo menos 1 tarjeta para generar códigos de barras';
+$lang['giftcards_excel_import_failed'] = 'Falló la exportación a Excel';
+$lang['giftcards_allow_alt_description'] = 'Permitir Descripción Alternativa';
+$lang['giftcards_is_serialized'] = 'La Tarjeta de Regalo tiene Número de Serie';
+$lang['giftcards_low_inventory_giftcards'] = 'Tarjetas con Bajo Inventario';
+$lang['giftcards_serialized_giftcards'] = 'Tarjetas Serializadas';
+$lang['giftcards_no_description_giftcards'] = 'Tarjetas de Regalo sin Descripción';
+$lang['giftcards_inventory_comments'] = 'Comentarios';
+$lang['giftcards_count'] = 'Actualizar Inventario';
+$lang['giftcards_details_count'] = 'Detalles del Levantamiento de Inventario';
+$lang['giftcards_add_minus'] = 'Inventario a agregar/substraer';
+$lang['giftcards_current_quantity'] = 'Cantidad Actual';
+$lang['giftcards_quantity_required'] = 'Cantidad es requerido. Por favor, haz click en ( X ) para cancelar';
+$lang['giftcards_do_nothing'] = 'No hacer nada';
+$lang['giftcards_change_all_to_serialized'] = 'Cambiar Todo A Serializado';
+$lang['giftcards_change_all_to_unserialized'] = 'Cambiar Todo A Deserializado';
+$lang['giftcards_change_all_to_allow_alt_desc'] = 'Permitir Descripción Alternativa En Todos';
+$lang['giftcards_change_all_to_not_allow_allow_desc'] = 'No Permitir Descripción Alternativa Para Todos';
+$lang['giftcards_use_inventory_menu'] = 'Usar Menú de Inventario';
+$lang['giftcards_manually_editing_of_quantity'] = 'Edición Manual de Cantidad';
+?>
\ No newline at end of file
diff --git a/application/language/Spanish/index.html b/application/language/es/index.html
similarity index 100%
rename from application/language/Spanish/index.html
rename to application/language/es/index.html
diff --git a/application/language/Spanish/item_kits_lang.php b/application/language/es/item_kits_lang.php
similarity index 93%
rename from application/language/Spanish/item_kits_lang.php
rename to application/language/es/item_kits_lang.php
index 2ffd7b807..927555e8f 100644
--- a/application/language/Spanish/item_kits_lang.php
+++ b/application/language/es/item_kits_lang.php
@@ -4,7 +4,7 @@ $lang['item_kits_description'] = 'Descripción del Kit de Artículos';
 $lang['item_kits_no_item_kits_to_display'] = 'No hay kits de artículos para mostrar';
 $lang['item_kits_update'] = 'Actualizar Kit de Artículos';
 $lang['item_kits_new'] = 'Nuevo Kit de Artículos';
-$lang['item_kits_none_selected'] = "No has seleccionado kits de artículos";
+$lang['item_kits_none_selected'] = "No has seleccionado Kits de Artículos";
 $lang['item_kits_info'] = 'Info de Kit de Artículos';
 $lang['item_kits_successful_adding'] = 'Has agregado satisfactoriamente un Kit de Artículos';
 $lang['item_kits_successful_updating'] = 'Has actualizado satisfactoriamente un Kit de Artículos';
diff --git a/application/language/es/items_lang.php b/application/language/es/items_lang.php
new file mode 100644
index 000000000..f87e7266c
--- /dev/null
+++ b/application/language/es/items_lang.php
@@ -0,0 +1,81 @@
+<?php
+$lang['items_item_number'] = 'UPC/EAN/ISBN';
+$lang['items_retrive_item_info'] = 'Obtener Info de Artículo';
+$lang['items_description'] = 'Descripción';
+$lang['items_amazon'] = 'Amazon';
+$lang['items_upc_database'] = 'Base de datos UPC';
+$lang['items_cannot_find_item'] = 'No puedo encontrar información acerca del artículo';
+$lang['items_info_provided_by'] = 'Info provista por';
+$lang['items_basic_information'] = 'Infomación del Artículo';
+$lang['items_number_information'] = 'Número del Artículo';
+$lang['items_new'] = 'Nuevo Artículo';
+$lang['items_update'] = 'Actualizar Artículo';
+$lang['items_item'] = 'Artículo';
+$lang['items_edit_multiple_items'] = 'Editando Artículos Múltiples';
+$lang['items_name'] = 'Nombre del Artículo';
+$lang['items_category'] = 'Categoría';
+$lang['items_cost_price'] = 'Precio de Compra';
+$lang['items_unit_price'] = 'Precio de Venta';
+$lang['items_tax_1'] = 'Impuesto 1';
+$lang['items_tax_2'] = 'Impuesto 2';
+$lang['items_sales_tax_1'] = 'Impuesto de Ventas 1';
+$lang['items_sales_tax_2'] = 'Impuesto de Ventas 2';
+$lang['items_tax_percent'] = 'Porcentaje de Impuesto';
+$lang['items_tax_percents'] = 'Porcentaje de Impuesto(s)';
+$lang['items_reorder_level'] = 'Cantidad Mínima';
+$lang['items_quantity'] = 'Cantidad en Stock';
+$lang['items_reorder_level'] = 'Stock Mínimo';
+$lang['items_no_items_to_display'] = 'No hay artículos que mostrar';
+$lang['items_bulk_edit'] = 'Edición Múltiple';
+$lang['items_confirm_delete'] = '¿Estás seguro(a) de querer borrar los artículos seleccionados?';
+$lang['items_none_selected'] = 'No has seleccionado artículos para editar';
+$lang['items_confirm_bulk_edit'] = '¿Estás seguro(a) de querer editar los artículos seleccionados?';
+$lang['items_successful_bulk_edit'] = 'Has actualizado satisfactoriamente los artículos seleccionados';
+$lang['items_error_updating_multiple'] = 'Error actualizando artículos';
+$lang['items_edit_fields_you_want_to_update'] = 'Edita los campos que quieras actualizar en TODOS los artículos seleccionados';
+$lang['items_error_adding_updating'] = 'Error agregando/actualizando artículo';
+$lang['items_successful_adding'] = 'Has agregado satisfactoriamente un artículo';
+$lang['items_successful_updating'] = 'Has actualizando satisfactoriamente un artículo';
+$lang['items_successful_deleted'] = 'Has borrado satisfactoriamente';
+$lang['items_one_or_multiple'] = 'articulo(s)';
+$lang['items_cannot_be_deleted'] = 'No se pueden borrar los artículos seleccionados. Uno o más tiene(n) ventas.';
+$lang['items_name_required'] = 'Nombre de Artículo es requerido';
+$lang['items_category_required'] = 'Categoría es requerido';
+$lang['items_buy_price_required'] = 'Precio de Compra es requerido';
+$lang['items_unit_price_required'] = 'Precio de Venta es requerido';
+$lang['items_cost_price_required'] = 'Precio de Compra es requerido';
+$lang['items_tax_percent_required'] = 'Porcentaje de Impuesto es requerido';
+$lang['items_quantity_required'] = 'Cantidad es requerido';
+$lang['items_reorder_level_required'] = 'Cantidad Mínima es requerido';
+$lang['items_unit_price_number'] = 'Precio de Venta debe ser número';
+$lang['items_cost_price_number'] = 'Precio de Compra debe ser número';
+$lang['items_quantity_number'] = 'Cantidad debe ser número';
+$lang['items_reorder_level_number'] = 'Cantidad Mínima debe ser número';
+$lang['items_none'] = 'Ninguno';
+$lang['items_supplier'] = 'Proveedor';
+$lang['items_generate_barcodes'] = 'Generar Códigos de Barras';
+$lang['items_must_select_item_for_barcode'] = 'Debes seleccionar al menos 1 artículo para generar códigos de barras';
+$lang['items_excel_import_failed'] = 'Falló la importación de Excel';
+$lang['items_allow_alt_description'] = 'Permitir Descripción Alternativa';
+$lang['items_is_serialized'] = 'El Artículo tiene Número de Serie';
+$lang['items_low_inventory_items'] = 'Artículos de Inventario Escaso';
+$lang['items_serialized_items'] = 'Artículos Serializados';
+$lang['items_no_description_items'] = 'Artículos sin Descripción';
+$lang['items_search_custom_items'] = 'Buscar en campos personalizados';//GARRISON ADDED
+$lang['items_inventory_comments'] = 'Comentarios';
+$lang['items_count'] = 'Actualizar Inventario';
+$lang['items_details_count'] = 'Detalles de Cuenta de Inventario';
+$lang['items_add_minus'] = 'Inventario a agregar/substraer';
+$lang['items_current_quantity'] = 'Cantidad Actual';
+$lang['items_quantity_required'] = 'Cantidad es un valor requerido. Por favor cierre (X) para cancelar';
+$lang['items_do_nothing'] = 'No Hacer Nada';
+$lang['items_change_all_to_serialized'] = 'Cambiar Todo A Serializado';
+$lang['items_change_all_to_unserialized'] = 'Cambiar Todo A Deserializado';
+$lang['items_change_all_to_allow_alt_desc'] = 'Permitir Descripción Alternativa Para Todos';
+$lang['items_change_all_to_not_allow_allow_desc'] = 'Denegar Descripción Alternativa Para Todos';
+$lang['items_use_inventory_menu'] = 'Usar Menú de Inventario';
+$lang['items_manually_editing_of_quantity'] = 'Edición Manual de Cantidad';
+$lang['items_inventory'] = 'Inventario';
+$lang['items_location'] = 'Ubicación';
+$lang['items_is_deleted'] = 'Eliminado';// Parq 131215
+?>
\ No newline at end of file
diff --git a/application/language/es/login_lang.php b/application/language/es/login_lang.php
new file mode 100644
index 000000000..e1a4a4998
--- /dev/null
+++ b/application/language/es/login_lang.php
@@ -0,0 +1,8 @@
+<?php
+$lang['login_login'] = 'Iniciar Sesión';
+$lang['login_username'] = 'Usuario';
+$lang['login_password'] = 'Contraseña';
+$lang['login_go'] = 'Ir';
+$lang['login_invalid_username_and_password'] = 'Usuario/Contraseña inválidos';
+$lang['login_welcome_message'] = 'Bienvenido(a) al Sistema Open Source Point of Sale. Para continuar, inicia sesión usando tu Usuario y Contraseña.';
+?>
diff --git a/application/language/es/module_lang.php b/application/language/es/module_lang.php
new file mode 100644
index 000000000..adb46c4ee
--- /dev/null
+++ b/application/language/es/module_lang.php
@@ -0,0 +1,34 @@
+<?php
+$lang['module_home'] = 'Inicio';
+
+$lang['module_customers'] = 'Clientes';
+$lang['module_customers_desc'] = 'Agregar, Actualizar, Borrar y Buscar clientes';
+
+$lang['module_suppliers'] = 'Proveedores';
+$lang['module_suppliers_desc'] = 'Agregar, Actualizar, Borrar y Buscar proveedores';
+
+$lang['module_employees'] = 'Empleados';
+$lang['module_employees_desc'] = 'Agregar, Actualizar, Borrar y Buscar empleados';
+
+$lang['module_sales'] = 'Ventas';
+$lang['module_sales_desc'] = 'Procesar ventas y devoluciones';
+
+$lang['module_reports'] = 'Reportes';
+$lang['module_reports_desc'] = 'Ver y generar reportes';
+
+$lang['module_items'] = 'Artículos';
+$lang['module_items_desc'] = 'Agregar, Actualizar, Borrar y Buscar artículos';
+
+$lang['module_config'] = 'Configuración de la Tienda';
+$lang['module_config_desc'] = 'Cambiar la configuración de la tienda';
+
+$lang['module_receivings'] = 'Recepción';
+$lang['module_receivings_desc'] = 'Procesar órdenes de compra';
+
+$lang['module_giftcards'] = 'Tarjetas de Regalo';
+$lang['module_giftcards_desc'] = 'Agregar, Actualizar, Borrar y Buscar Tarjetas de Regalo';
+
+$lang['module_item_kits'] = 'Kits de Artículos';
+$lang['module_item_kits_desc'] = 'Agregar, Actualizar, Borrar y Buscar Kits de Artículos';
+
+?>
diff --git a/application/language/es/receivings_lang.php b/application/language/es/receivings_lang.php
new file mode 100644
index 000000000..6aade0795
--- /dev/null
+++ b/application/language/es/receivings_lang.php
@@ -0,0 +1,26 @@
+<?php
+$lang['recvs_register'] = 'Entrada de Artículos';
+$lang['recvs_mode'] = 'Modo de Entradas';
+$lang['recvs_receiving'] = 'Recibir';
+$lang['recvs_return'] = 'Devolver';
+$lang['recvs_total'] = 'Total';
+$lang['recvs_cost'] = 'Costo';
+$lang['recvs_quantity'] = 'Cant.';
+$lang['recvs_discount'] = 'Descuento %';
+$lang['recvs_edit'] = 'Editar';
+$lang['recvs_new_supplier'] = 'Nuevo Proveedor';
+$lang['recvs_supplier'] = 'Proveedor';
+$lang['recvs_select_supplier'] = 'Seleccionar Proveedor (Opcional)';
+$lang['recvs_start_typing_supplier_name'] = 'Empieza a escribir el nombre del proveedor...';
+$lang['recvs_unable_to_add_item'] = 'No se puede agregar el artículo a la entrada';
+$lang['recvs_error_editing_item'] = 'Error al editar artículo';
+$lang['recvs_receipt'] = 'Recibo de Entrada';
+$lang['recvs_complete_receiving'] = 'Terminar';
+$lang['recvs_confirm_finish_receiving'] = '¿Estás seguro(a) de querer procesar esta entrada? Ésto no puede ser deshecho.';
+$lang['recvs_confirm_cancel_receiving'] = '¿Estás seguro(a) de querer limpiar esta entrada? Todos los artículos serán limpiados.';
+$lang['recvs_find_or_scan_item'] = 'Encontrar/Escanear Artículo';
+$lang['recvs_find_or_scan_item_or_receipt'] = 'Encontrar/Escanear Artículo o Entrada';
+$lang['recvs_id'] = 'ID de Entrada';
+$lang['recvs_item_name'] = 'Nombre del Artículo';
+$lang['receivings_transaction_failed'] = 'Las Transacciones de Entrada Fallaron';
+?>
diff --git a/application/language/Spanish/reports_lang.php b/application/language/es/reports_lang.php
similarity index 85%
rename from application/language/Spanish/reports_lang.php
rename to application/language/es/reports_lang.php
index 94d67239c..93b7df5a4 100644
--- a/application/language/Spanish/reports_lang.php
+++ b/application/language/es/reports_lang.php
@@ -12,8 +12,6 @@ $lang['reports_taxes_summary_report'] = 'Reporte de Resumen de Impuestos';
 $lang['reports_date'] = 'Fecha';
 $lang['reports_name'] = 'Nombre';
 $lang['reports_quantity_purchased'] = 'Cantidad Comprada';
-$lang['reports_serial_number'] = 'Serial #';
-$lang['reports_description'] = 'Descripción';
 $lang['reports_sale_id'] = 'ID de Venta';
 $lang['reports_items_purchased'] = 'Artículos Comprados';
 $lang['reports_sold_by'] = 'Vendido Por';
@@ -25,7 +23,6 @@ $lang['reports_item'] = 'Artículo';
 $lang['reports_items'] = 'Artículos';
 $lang['reports_supplier'] = 'Proveedor';
 $lang['reports_employees'] = 'Empleados';
-$lang['reports_taxes'] = 'Impuestos';
 $lang['reports_subtotal'] = 'Subtotal';
 $lang['reports_total'] = 'Total';
 $lang['reports_tax'] = 'Impuesto';
@@ -37,10 +34,10 @@ $lang['reports_today'] = 'Hoy';
 $lang['reports_yesterday'] = 'Ayer';
 $lang['reports_last_7'] = 'Últimos 7 Días';
 $lang['reports_this_month'] = 'Este Mes';
-$lang['reports_last_month'] = 'Mes Pasado';
+$lang['reports_last_month'] = 'Último Mes';
 $lang['reports_this_year'] = 'Este Año';
-$lang['reports_last_year'] = 'Año Pasado';
-$lang['reports_all_time'] = 'Todos los Tiempos';
+$lang['reports_last_year'] = 'Último Año';
+$lang['reports_all_time'] = 'Todos';
 $lang['reports_detailed_sales_report'] = 'Reporte de Ventas Detallado';
 $lang['reports_comments'] = 'Comentarios';
 $lang['reports_discount'] = 'Descuento';
@@ -51,24 +48,29 @@ $lang['reports_customers'] = 'Clientes';
 $lang['reports_suppliers'] = 'Proveedores';
 $lang['reports_items'] = 'Artículos';
 $lang['reports_employees'] = 'Empleados';
+$lang['reports_taxes'] = 'Impuestos';
 $lang['reports_customer'] = 'Cliente';
 $lang['reports_employee'] = 'Empleado';
 $lang['reports_tax_percent'] = 'Porcentaje de Impuestos';
+$lang['reports_quantity_purchased'] = 'Cantidad Comprada';
+$lang['reports_serial_number'] = 'S/N:';
+$lang['reports_description'] = 'Descripción';
+$lang['reports_date'] = 'Fecha';
 $lang['reports_sales_amount'] = 'Monto de ventas';
 $lang['reports_revenue'] = 'Ingresos';
 $lang['reports_discounts'] = 'Descuentos';
 $lang['reports_discounts_summary_report'] = 'Reporte de Resumen de Descuentos';
-$lang['reports_discount_percent'] = 'Porcentaje de Decuento';
+$lang['reports_discount_percent'] = 'Porcentaje de Descuento';
 $lang['reports_count'] = 'Cuenta';
-$lang['reports_summary_reports'] = 'Reportes de Resumen';
+$lang['reports_summary_reports'] = 'Reportes Resumidos';
 $lang['reports_graphical_reports'] = 'Reportes Gráficos';
 $lang['reports_detailed_reports'] = 'Reportes Detallados';
 $lang['reports_inventory_reports'] = 'Reportes de Inventario';
-$lang['reports_low_inventory'] = 'Inventario Escaso';
+$lang['reports_low_inventory'] = 'Inventario Bajo';
 $lang['reports_inventory_summary'] = 'Resumen de Inventario';
 $lang['reports_item_number'] = 'Número de Artículo';
-$lang['reports_reorder_level'] = 'Nivel de Reordenamiento';
-$lang['reports_low_inventory_report'] = 'Reporte de Inventario Escaso';
+$lang['reports_reorder_level'] = 'Cantidad Mínima';
+$lang['reports_low_inventory_report'] = 'Reporte de Inventario Bajo';
 $lang['reports_item_name'] = 'Nombre del Artículo';
 $lang['reports_inventory_summary_report'] = 'Reporte de Resumen de Inventario';
 $lang['reports_payment_type'] = 'Tipo de Pago';
@@ -82,4 +84,5 @@ $lang['reports_detailed_receivings_report'] = 'Reporte Detallado de Entradas';
 $lang['reports_sale_type'] = 'Tipo de Venta';
 $lang['reports_all'] = 'Todo';
 $lang['reports_returns'] = 'Devoluciones';
-?>
+$lang['reports_discount'] = 'Descuento mayor que ';
+?>
\ No newline at end of file
diff --git a/application/language/Spanish/sales_lang.php b/application/language/es/sales_lang.php
similarity index 54%
rename from application/language/Spanish/sales_lang.php
rename to application/language/es/sales_lang.php
index d1612d701..448a0ff11 100644
--- a/application/language/Spanish/sales_lang.php
+++ b/application/language/es/sales_lang.php
@@ -1,47 +1,48 @@
 <?php
-$lang['sales_giftcard_number']='Número de Tarjeta de Regalo';
-$lang['sales_giftcard']='Tarjeta de Regalo';
-$lang['sales_register']='Registro de Ventas';
-$lang['sales_mode']='Modo de Registro';
+$lang['sales_giftcard_number'] = 'Número de Tarjeta de Regalo';
+$lang['sales_giftcard'] = 'Tarjeta de Regalo';
+$lang['sales_register'] = 'Registro de Ventas';
+$lang['sales_mode'] = 'Modo';
 $lang['sales_new_item'] = 'Artículo Nuevo';
 $lang['sales_item_name'] = 'Nombre del Artículo';
-$lang['sales_item_number'] = '# del Artículo';
+$lang['sales_item_number'] = 'UPC/EAN/ISBN';
 $lang['sales_new_customer'] = 'Cliente Nuevo';
 $lang['sales_customer'] = 'cliente';
-$lang['sales_no_items_in_cart']='No hay artículos en el carrito';
-$lang['sales_total']='Total';
-$lang['sales_tax_percent']='% de Impuesto';
-$lang['sales_price']='Precio';
-$lang['sales_quantity']='Cant.';
-$lang['sales_discount']='Desc %';
-$lang['sales_edit']='Editar';
-$lang['sales_payment']='Tipo de Pago';
-$lang['sales_edit_item']='Editar Artículo';
-$lang['sales_find_or_scan_item']='Encontrar/Escanear Artículo';
-$lang['sales_find_or_scan_item_or_receipt']='Encontrar/Escanear Artículo O Entrada';
-$lang['sales_select_customer']='Seleccionar Cliente (Opcional)';
-$lang['sales_start_typing_item_name']='Empieza a escribir el nombre del artículo o escanea el código de barras...';
-$lang['sales_start_typing_customer_name']='Empieza a escribir el nombre del cliente...';
-$lang['sales_sub_total']='Sub Total';
-$lang['sales_tax']='Impuesto';
-$lang['sales_comment']='Comentario';
-$lang['sales_unable_to_add_item']='No pude agregar el artículo a la venta';
-$lang['sales_sale_for_customer']='Cliente:';
-$lang['sales_remove_customer']='Borrar Cliente';
-$lang['sales_error_editing_item']='Error editando artículo';
-$lang['sales_complete_sale']='Completar Venta';
-$lang['sales_cancel_sale']='Cancelar Venta';
-$lang['sales_add_payment']='Agregar Pago';
-$lang['sales_receipt']='Recibo de Venta';
-$lang['sales_id']='ID de Venta';
-$lang['sales_sale']='Venta';
-$lang['sales_return']='Regresar';
+$lang['sales_no_items_in_cart'] = 'No hay artículos en el carrito';
+$lang['sales_total'] = 'Total';
+$lang['sales_tax_percent'] = '% de Impuesto';
+$lang['sales_price'] = 'Precio';
+$lang['sales_quantity'] = 'Cant.';
+$lang['sales_discount'] = 'Desc %';
+$lang['sales_edit'] = 'Editar';
+$lang['sales_payment'] = 'Tipo de Pago';
+$lang['sales_edit_item'] = 'Editar Artículo';
+$lang['sales_find_or_scan_item'] = 'Encontrar/Escanear Artículo';
+$lang['sales_find_or_scan_item_or_receipt'] = 'Encontrar/Escanear Artículo o Entrada';
+$lang['sales_select_customer'] = 'Seleccionar Cliente (Opcional)';
+$lang['sales_start_typing_item_name'] = 'Empieza a escribir o escanea el código de barras...';
+$lang['sales_start_typing_customer_name'] = 'Empieza a escribir el cliente...';
+$lang['sales_sub_total'] = 'Subtotal';
+$lang['sales_tax'] = 'Impuesto';
+$lang['sales_comment'] = 'Comentario';
+$lang['sales_unable_to_add_item'] = 'No se puede agregar el artículo a la venta';
+$lang['sales_sale_for_customer'] = 'Cliente:';
+$lang['sales_remove_customer'] = 'Borrar Cliente';
+$lang['sales_error_editing_item'] = 'Error editando artículo';
+$lang['sales_complete_sale'] = 'Completar Venta';
+$lang['sales_cancel_sale'] = 'Cancelar Venta';
+$lang['sales_add_payment'] = 'Agregar Pago';
+$lang['sales_receipt'] = 'Recibo de Venta';
+$lang['sales_id'] = 'ID de Venta';
+$lang['sales_sale'] = 'Venta';
+$lang['sales_return'] = 'Devolución';
 $lang['sales_confirm_finish_sale'] = '¿Estás seguro(a) de querer procesar esta venta? Ésto no se puede deshacer.';
 $lang['sales_confirm_cancel_sale'] = '¿Estás seguro(a) de querer limpiar esta venta? Todos los artículos serán limpiados.';
 $lang['sales_cash'] = 'Efectivo';
 $lang['sales_check'] = 'Cheque';
 $lang['sales_debit'] = 'Tarjeta de Débito';
 $lang['sales_credit'] = 'Tarjeta de Crédito';
+$lang['sales_giftcard'] = 'Gift Card';
 $lang['sales_amount_tendered'] = 'Cantidad Recibida';
 $lang['sales_change_due'] = 'Cambio';
 $lang['sales_payment_not_cover_total'] = 'La Cantidad Recibida no cubre el pago total';
@@ -52,7 +53,7 @@ $lang['sales_serial'] = 'Serial';
 $lang['sales_description_abbrv'] = 'Desc';
 $lang['sales_item_out_of_stock'] = 'El artículo está agotado';
 $lang['sales_item_insufficient_of_stock'] = 'Hay un número insuficiente de Artículos en existencia';
-$lang['sales_quantity_less_than_zero'] = 'Advertencia. La cantidad deseada es insuficiente. Puedes procesar la venta pero checa tu inventario.';
+$lang['sales_quantity_less_than_zero'] = 'Advertencia. La cantidad deseada es insuficiente. Puedes procesar la venta pero verifica el inventario.';
 $lang['sales_successfully_updated'] = 'La venta ha sido actualizada satisfactoriamente';
 $lang['sales_unsuccessfully_updated'] = 'Ha fallado la actualización de la venta';
 $lang['sales_edit_sale'] = 'Editar Venta';
@@ -61,7 +62,6 @@ $lang['sales_successfully_deleted'] = 'La Venta ha sido borrada satisfactoriamen
 $lang['sales_unsuccessfully_deleted'] = 'Ha fallado la eliminación de la Venta';
 $lang['sales_delete_entire_sale'] = 'Borrar la venta completa';
 $lang['sales_delete_confirmation'] = '¿Estás seguro(a) de querer borrar esta venta? Esta acción no se puede deshacer.';
-$lang['sales_date'] = 'Fecha de Venta';
 $lang['sales_delete_successful'] = 'Has borrado satisfactoriamente una venta';
 $lang['sales_delete_unsuccessful'] = 'No he podido borrar la venta satisfactoriamente';
 $lang['sales_suspend_sale'] = 'Suspender Venta';
@@ -69,10 +69,14 @@ $lang['sales_confirm_suspend_sale'] = '¿Estás seguro(a) de querer suspender es
 $lang['sales_suspended_sales'] = 'Ventas Suspendidas';
 $lang['sales_suspended_sale_id'] = 'ID de Venta Suspendida';
 $lang['sales_date'] = 'Fecha';
-$lang['sales_customer'] = 'Cliente';
 $lang['sales_comments'] = 'Comentarios';
-$lang['sales_unsuspend_and_delete'] = 'Desuspender y Borrar';
-$lang['sales_unsuspend'] = 'Desuspender';
+$lang['sales_unsuspend_and_delete'] = 'Retomar y Borrar';
+$lang['sales_unsuspend'] = 'Retomar';
 $lang['sales_successfully_suspended_sale'] = 'La venta ha sido suspendida satisfactoriamente';
-$lang['sales_email_receipt'] = 'E-Mail Receipt';
+$lang['sales_email_receipt'] = 'Enviar Ticket';
+$lang['sales_discount_short']='%';
+$lang["sales_discount_included"]='% Descuento';
+$lang['sales_sale_time']='Hora';
+$lang['sales_payments_total'] = 'Pagado';
+$lang['sales_amount_due'] = 'Debe';
 ?>
diff --git a/application/language/es/suppliers_lang.php b/application/language/es/suppliers_lang.php
new file mode 100644
index 000000000..143ffeb54
--- /dev/null
+++ b/application/language/es/suppliers_lang.php
@@ -0,0 +1,17 @@
+<?php
+$lang['suppliers_new'] = 'Nuevo Proveedor';
+$lang['suppliers_supplier'] = 'Proveedor';
+$lang['suppliers_update'] = 'Actualizar Proveedor';
+$lang['suppliers_confirm_delete'] = 'Estás seguro(a) de querer borrar los proveedores seleccionados?';
+$lang['suppliers_none_selected'] = 'No has seleccionado proveedores para borrar';
+$lang['suppliers_error_adding_updating'] = 'Error agregando/actualizando proveedor';
+$lang['suppliers_successful_adding'] = 'Has agregado el proveedor satisfactoriamente';
+$lang['suppliers_successful_updating'] = 'Has actualizado el proveedor satisfactoriamente';
+$lang['suppliers_successful_deleted'] = 'Has borrado satisfactoriamente a';
+$lang['suppliers_one_or_multiple'] = 'proveedor(es)';
+$lang['suppliers_cannot_be_deleted'] = 'No se pudo borrar los proveedores seleccionados. Uno o más de los seleccionados tiene ventas.';
+$lang['suppliers_basic_information'] = 'Información de Proveedores';
+$lang['suppliers_account_number'] = 'Cuenta #';
+$lang['suppliers_company_name'] = 'Nombre de la Compañía';
+$lang['suppliers_company_name_required'] = 'Nombre de la Compañía es requerido';
+?>
\ No newline at end of file
diff --git a/application/language/id/common_lang.php b/application/language/id/common_lang.php
new file mode 100644
index 000000000..bad1431db
--- /dev/null
+++ b/application/language/id/common_lang.php
@@ -0,0 +1,41 @@
+<?php
+$lang['common_common'] = 'biasa';
+$lang['common_submit'] = 'Kirim';
+$lang['common_or'] = 'ATAU';
+$lang['common_powered_by'] = 'Disponsori oleh';
+$lang['common_welcome'] = 'Selamat Datang';
+$lang['common_logout'] = 'Logout';
+$lang['common_list_of'] = 'Daftar';
+$lang['common_first_name'] = 'Nama Pertama';
+$lang['common_last_name'] = 'Nama Belakang';
+$lang['common_email'] = 'E-Mail';
+$lang['common_phone_number'] = 'Telepon';
+$lang['common_address_1'] = 'Alamat 1';
+$lang['common_address_2'] = 'Alamat 2';
+$lang['common_city'] = 'Kota';
+$lang['common_state'] = 'Provinsi';
+$lang['common_zip'] = 'KODEPOS';
+$lang['common_country'] = 'Negara';
+$lang['common_comments'] = 'Catatan';
+$lang['common_edit'] = 'ubah';
+$lang['common_search'] = 'Cari';
+$lang['common_delete'] = 'Hapus';
+$lang['common_remove'] = 'Remove';
+$lang['common_view_recent_sales'] = 'Lihat Penjualan Terkini';
+$lang['common_you_are_using_ospos'] = 'Anda menggunakan Open Source Point Of Sale Versi';
+$lang['common_please_visit_my'] = 'SIlakan kunjungi';
+$lang['common_website'] = 'situs';
+$lang['common_fields_required_message'] = 'bagian yang ditandai merah wajib diisi';
+$lang['common_learn_about_project'] = 'untuk belajar informasi terbaru tentang proyek ini';
+$lang['common_searched_for'] = 'Mencari untuk';
+$lang['common_first_name_required'] = 'Nama pertama wajib diisi.';
+$lang['common_last_name_required'] = 'Nama belakang wajib diisi.';
+$lang['common_email_invalid_format'] = 'Format alamat e-mail tidak benar';
+$lang['common_confirm_search'] = 'Anda telah memilih satu atau lebih baris, ini tidak akan lagi dipilih setelah pencarian Anda. Apakah Anda yakin ingin mengirimkan pencarian ini?';
+$lang['common_no_persons_to_display'] = 'Tidak ada orang untuk ditampilkan';
+$lang['common_return_policy'] = 'Kebijakan Retur';
+$lang['common_price'] = 'Harga';
+$lang['common_welcome_message']= 'Selamat Datang di Open Source Point Of Sale, klik modul di bawah ini untuk memulai!';
+$lang['common_inv'] = 'inv';
+$lang['common_det'] = 'details';
+?>
\ No newline at end of file
diff --git a/application/language/id/config_lang.php b/application/language/id/config_lang.php
new file mode 100644
index 000000000..b91030b62
--- /dev/null
+++ b/application/language/id/config_lang.php
@@ -0,0 +1,36 @@
+<?php
+$lang['config_info'] = 'Informasi Konfigurasi Toko';
+$lang['config_company'] = 'Nama Perusahaan';
+$lang['config_address'] = 'Alamat Perusahaan';
+$lang['config_phone'] = 'Telepon Perusahaan';
+$lang['config_website'] = 'Situs Perusahaan';
+$lang['config_fax'] = 'Fax';
+$lang['config_default_tax_rate'] = 'Tarif Pajak Biasa%';
+$lang['config_default_tax_rate_1'] = 'Tarif Pajak 1';
+$lang['config_default_tax_rate_2'] = 'Tarif Pajak 2';
+$lang['config_company_required'] = 'Nama Perusahaan wajib diisi';
+$lang['config_address_required'] = 'Alamat Perusahaan wajib diisi';
+$lang['config_phone_required'] = 'Telepon Perusahaan wajib diisi';
+$lang['config_default_tax_rate_required'] = 'Tarif Pajak Biasa wajib diisi';
+$lang['config_default_tax_rate_number'] = 'Tarif Pajak Biasa harus angka';
+$lang['config_company_website_url'] = 'Situs Perusahaan bukan URL yang benar(http://...)';
+$lang['config_saved_successfully'] = 'Konfigurasi berhasil disimpan';
+$lang['config_saved_unsuccessfully'] = 'Konfigurasi tidak berhasil disimpan';
+$lang['config_return_policy_required'] = 'Kebiajak retur wajib diisi';
+$lang['config_print_after_sale'] = 'Cetak bon setelah penjualan';
+$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/id/customers_lang.php b/application/language/id/customers_lang.php
new file mode 100644
index 000000000..ca8c9a200
--- /dev/null
+++ b/application/language/id/customers_lang.php
@@ -0,0 +1,16 @@
+<?php
+$lang['customers_new'] = 'Pelanggan Baru';
+$lang['customers_customer'] = 'Pelanggan';
+$lang['customers_update'] = 'Ubah Pelanggan';
+$lang['customers_confirm_delete'] = 'Apakah Anda yakin ingin menghapus pelanggan yang dipilih?';
+$lang['customers_none_selected'] = 'Anda belum memilih pelanggan untuk dihapus';
+$lang['customers_error_adding_updating'] = 'Error menambah / memperbarui pelanggan';
+$lang['customers_successful_adding'] = 'Anda telah berhasil menambah pelanggan';
+$lang['customers_successful_updating'] = 'Anda telah berhasil memperbarui pelanggan';
+$lang['customers_successful_deleted'] = 'Anda telah berhasil menghapus';
+$lang['customers_one_or_multiple'] = 'pelanggan';
+$lang['customers_cannot_be_deleted'] = 'pelanggan terpilih tidak bisa dihapus; satu atau lebih dari pelanggan yang dipilih memiliki penjualan.';
+$lang['customers_basic_information'] = 'Informasi Pelanggan';
+$lang['customers_account_number'] = 'Nomor Akun';
+$lang['customers_taxable'] = 'Dapat dikenakan pajak';
+?>
\ No newline at end of file
diff --git a/application/language/id/employees_lang.php b/application/language/id/employees_lang.php
new file mode 100644
index 000000000..f2152d70c
--- /dev/null
+++ b/application/language/id/employees_lang.php
@@ -0,0 +1,27 @@
+<?php
+$lang['employees_employee'] = 'Karyawan';
+$lang['employees_new'] = 'Karyawan Baru';
+$lang['employees_update'] = 'Ubah Karyawan';
+$lang['employees_confirm_delete'] = 'Apakah Anda yakin ingin menghapus karyawan yang dipilih?';
+$lang['employees_none_selected'] = 'Anda belum memilih karyawan untuk menghapus';
+$lang['employees_error_adding_updating'] = 'Error menambah / memperbarui karyawan';
+$lang['employees_successful_adding'] = 'Anda telah berhasil menambahkan karyawan';
+$lang['employees_successful_updating'] = 'Anda telah berhasil memperbarui karyawan';
+$lang['employees_successful_deleted'] = 'Anda telah berhasil menghapus';
+$lang['employees_one_or_multiple'] = 'karyawan';
+$lang['employees_cannot_be_deleted'] = 'karyawan terpilih tidak bisa dihapus; satu atau lebih dari para pekerja telah memproses penjualan atau Anda mencoba untuk menghapus diri Anda sendiri:)';
+$lang['employees_username'] = 'Username';
+$lang['employees_password'] = 'Password';
+$lang['employees_repeat_password'] = 'Password Lagi';
+$lang['employees_username_required'] = 'Username wajib diisi';
+$lang['employees_username_minlength'] = 'Username minimal 5 huruf';
+$lang['employees_password_required'] = 'Password wajib diisi';
+$lang['employees_password_minlength'] = 'Passwords minimal 8 huruf/angka';
+$lang['employees_password_must_match'] = 'Passwords tidak cocok';
+$lang['employees_basic_information'] = 'Informasi Karyawan';
+$lang['employees_login_info'] = 'Info Login Karyawan';
+$lang['employees_permission_info'] = 'Hak Akses Karyawan';
+$lang['employees_permission_desc'] = 'Tandai kotak di bawah ini untuk memberikan akses ke modul';
+$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';
+?>
\ No newline at end of file
diff --git a/application/language/id/error_lang.php b/application/language/id/error_lang.php
new file mode 100644
index 000000000..9c2e268af
--- /dev/null
+++ b/application/language/id/error_lang.php
@@ -0,0 +1,4 @@
+<?php
+$lang['error_no_permission_module'] = 'Anda tidak memiliki izin untuk mengakses modul ini';
+$lang['error_unknown'] = 'tidak dikenal';
+?>
\ No newline at end of file
diff --git a/application/language/id/form_validation_lang.php b/application/language/id/form_validation_lang.php
new file mode 100644
index 000000000..3418f29ab
--- /dev/null
+++ b/application/language/id/form_validation_lang.php
@@ -0,0 +1,29 @@
+<?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/application/language/id/giftcards_lang.php b/application/language/id/giftcards_lang.php
new file mode 100644
index 000000000..bb740895a
--- /dev/null
+++ b/application/language/id/giftcards_lang.php
@@ -0,0 +1,69 @@
+<?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'] = 'Retrive 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/BahasaIndonesia/index.html b/application/language/id/index.html
similarity index 100%
rename from application/language/BahasaIndonesia/index.html
rename to application/language/id/index.html
diff --git a/application/language/BahasaIndonesia/item_kits_lang.php b/application/language/id/item_kits_lang.php
similarity index 99%
rename from application/language/BahasaIndonesia/item_kits_lang.php
rename to application/language/id/item_kits_lang.php
index ebd06926b..601fae62d 100644
--- a/application/language/BahasaIndonesia/item_kits_lang.php
+++ b/application/language/id/item_kits_lang.php
@@ -17,4 +17,4 @@ $lang['item_kits_add_item'] = 'Add Item';
 $lang['item_kits_items'] = 'Items';
 $lang['item_kits_item'] = 'Item';
 $lang['item_kits_quantity'] = 'Quantity';
-?>
\ No newline at end of file
+?>
diff --git a/application/language/id/items_lang.php b/application/language/id/items_lang.php
new file mode 100644
index 000000000..a6cf78e93
--- /dev/null
+++ b/application/language/id/items_lang.php
@@ -0,0 +1,81 @@
+<?php
+$lang['items_item_number'] = 'UPC/EAN/ISBN';
+$lang['items_retrive_item_info'] = 'Dapatkan Info Produk/Item';
+$lang['items_description'] = 'Deskripsi';
+$lang['items_amazon'] = 'Amazon';
+$lang['items_upc_database'] = 'Database UPC';
+$lang['items_cannot_find_item'] = 'Tidak dapat menemukan informasi apapun tentang item';
+$lang['items_info_provided_by'] = 'Info disediakan oleh';
+$lang['items_basic_information'] = 'Informasi Item';
+$lang['items_number_information'] = 'Nomor Item';
+$lang['items_new'] = 'Item Baru';
+$lang['items_update'] = 'Ubah Item';
+$lang['items_item'] = 'Item';
+$lang['items_edit_multiple_items'] = 'Ubah Beberapa Item';
+$lang['items_name'] = 'Nama Item';
+$lang['items_category'] = 'Kategori';
+$lang['items_cost_price'] = 'Biaya Item';
+$lang['items_unit_price'] = 'Harga Satuan';
+$lang['items_tax_1'] = 'Pajak 1';
+$lang['items_tax_2'] = 'Pajak 2';
+$lang['items_sales_tax_1'] = 'Pajak Penjualan';
+$lang['items_sales_tax_2'] = 'Pajak Penjualan2';
+$lang['items_tax_percent'] = 'Tarif Pajak';
+$lang['items_tax_percents'] = 'Tarif Pajak';
+$lang['items_reorder_level'] = 'Batas pesan ulang';
+$lang['items_quantity'] = 'Jumlah';
+$lang['items_reorder_level'] = 'Batas pesan ulang';
+$lang['items_no_items_to_display'] = 'Tidak ada item untuk ditampilkan';
+$lang['items_bulk_edit'] = 'Ubah Massal';
+$lang['items_confirm_delete'] = 'Apakah Anda yakin ingin menghapus item yang dipilih?';
+$lang['items_none_selected'] = 'Anda belum memilih item untuk diubah';
+$lang['items_confirm_bulk_edit'] = 'Apakah Anda yakin ingin mengubah semua item yang dipilih?';
+$lang['items_successful_bulk_edit'] = 'Anda telah berhasil memperbarui item yang dipilih';
+$lang['items_error_updating_multiple'] = 'Error ketika memperbaharui item';
+$lang['items_edit_fields_you_want_to_update'] = 'Ubah bagian yang ingin Anda edit untuk SEMUA item yang dipilih';
+$lang['items_error_adding_updating'] = 'Error ketika menambahkan/memperbaharui item';
+$lang['items_successful_adding'] = 'Anda telah berhasil menambahkan item';
+$lang['items_successful_updating'] = 'Anda telah berhasil memperbarui item';
+$lang['items_successful_deleted'] = 'Anda telah berhasil menghapus';
+$lang['items_one_or_multiple'] = 'item';
+$lang['items_cannot_be_deleted'] = 'Tidak dapat menghapus item terpilih, satu atau lebih item yang dipilih memiliki penjualan.';
+$lang['items_name_required'] = 'Nama item wajib diisi';
+$lang['items_category_required'] = 'Kategori wajib diisi';
+$lang['items_buy_price_required'] = 'Harga Beli wajib diisi';
+$lang['items_unit_price_required'] = 'Harga Jual wajib diisi';
+$lang['items_cost_price_required'] = 'Biaya Item wajib diisi';
+$lang['items_tax_percent_required'] = 'Tarif Pajak wajib diisi';
+$lang['items_quantity_required'] = 'Jumlah wajib diisi';
+$lang['items_reorder_level_required'] = 'Batas pesan ulang wajib diisi';
+$lang['items_unit_price_number'] = 'Harga satuan harus angka';
+$lang['items_cost_price_number'] = 'Biaya Item harus angka';
+$lang['items_quantity_number'] = 'Jumlah harus angka';
+$lang['items_reorder_level_number'] = 'Batas pesan ulang harus angka';
+$lang['items_none'] = 'Kosong';
+$lang['items_supplier'] = 'Pemasok';
+$lang['items_generate_barcodes'] = 'Hasilkan Barcode';
+$lang['items_must_select_item_for_barcode'] = 'Anda harus memilih setidaknya 1 item untuk menghasilkan barcode';
+$lang['items_excel_import_failed'] = 'Excel import failed';
+$lang['items_allow_alt_description'] = 'Allow Alternate 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/id/login_lang.php b/application/language/id/login_lang.php
new file mode 100644
index 000000000..e3e540262
--- /dev/null
+++ b/application/language/id/login_lang.php
@@ -0,0 +1,8 @@
+<?php
+$lang['login_login'] = 'Masuk';
+$lang['login_username'] = 'Nama pengguna';
+$lang['login_password'] = 'Kata kunci';
+$lang['login_go'] = 'Lanjutkan';
+$lang['login_invalid_username_and_password'] = 'nama pengguna/kata kunci salah';
+$lang['login_welcome_message'] = 'Selamat datang di Open Source Point of Sale System. Untuk melanjutkan, silakan login menggunakan form nama pengguna dan kata kunci di bawah ini.';
+?>
diff --git a/application/language/id/module_lang.php b/application/language/id/module_lang.php
new file mode 100644
index 000000000..4aaaed19c
--- /dev/null
+++ b/application/language/id/module_lang.php
@@ -0,0 +1,34 @@
+<?php
+$lang['module_home'] = 'Beranda';
+
+$lang['module_customers'] = 'Pelanggan';
+$lang['module_customers_desc'] = 'Tambah, Update, Hapus, dan Cari pelanggan ';
+
+$lang['module_suppliers'] = 'Pemasok';
+$lang['module_suppliers_desc'] = 'Tambah, Update, Hapus, dan Cari pemasok';
+
+$lang['module_employees'] = 'Karyawan';
+$lang['module_employees_desc'] = 'Tambah, Update, Hapus, dan Cari karyawan';
+
+$lang['module_sales'] = 'Penjualan';
+$lang['module_sales_desc'] = 'Proses penjualan dan retur';
+
+$lang['module_reports'] = 'Laporan';
+$lang['module_reports_desc'] = 'Lihat dan Hasilkan laporan';
+
+$lang['module_items'] = 'Produk/Item';
+$lang['module_items_desc'] = 'Tambah, Update, Hapus, dan Cari produk/items';
+
+$lang['module_config'] = 'Konfigurasi Toko';
+$lang['module_config_desc'] = 'Ubah konfigurasi toko';
+
+$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/id/receivings_lang.php b/application/language/id/receivings_lang.php
new file mode 100644
index 000000000..efeb84355
--- /dev/null
+++ b/application/language/id/receivings_lang.php
@@ -0,0 +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_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/BahasaIndonesia/reports_lang.php b/application/language/id/reports_lang.php
similarity index 96%
rename from application/language/BahasaIndonesia/reports_lang.php
rename to application/language/id/reports_lang.php
index a32b1bd22..f2c7156fb 100644
--- a/application/language/BahasaIndonesia/reports_lang.php
+++ b/application/language/id/reports_lang.php
@@ -12,8 +12,6 @@ $lang['reports_taxes_summary_report'] = 'Taxes Summary Report';
 $lang['reports_date'] = 'Tanggal';
 $lang['reports_name'] = 'Nama';
 $lang['reports_quantity_purchased'] = 'Jumlah Dibeli';
-$lang['reports_serial_number'] = 'Serial #';
-$lang['reports_description'] = 'Description';
 $lang['reports_sale_id'] = 'ID Penjualan ';
 $lang['reports_items_purchased'] = 'Produk Dibeli';
 $lang['reports_sold_by'] = 'Dijual Oleh';
@@ -25,7 +23,6 @@ $lang['reports_item'] = 'Produk/Item';
 $lang['reports_items'] = 'Produk/Item';
 $lang['reports_supplier'] = 'Pemasok';
 $lang['reports_employees'] = 'Karyawan';
-$lang['reports_taxes'] = 'Taxes';
 $lang['reports_subtotal'] = 'Subtotal';
 $lang['reports_total'] = 'Total';
 $lang['reports_tax'] = 'Pajak';
@@ -51,9 +48,14 @@ $lang['reports_customers'] = 'Pelanggan';
 $lang['reports_suppliers'] = 'Pemasok';
 $lang['reports_items'] = 'Item';
 $lang['reports_employees'] = 'Karyawan';
+$lang['reports_taxes'] = 'Taxes';
 $lang['reports_customer'] = 'Pelanggan';
 $lang['reports_employee'] = 'Karyawan';
 $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';
@@ -82,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'] = 'A discount greater than ';
+?>
\ No newline at end of file
diff --git a/application/language/BahasaIndonesia/sales_lang.php b/application/language/id/sales_lang.php
similarity index 59%
rename from application/language/BahasaIndonesia/sales_lang.php
rename to application/language/id/sales_lang.php
index 089c3ef23..47d6e60ca 100644
--- a/application/language/BahasaIndonesia/sales_lang.php
+++ b/application/language/id/sales_lang.php
@@ -1,47 +1,48 @@
 <?php
-$lang['sales_giftcard_number']='Gift Card Number';
-$lang['sales_giftcard']='Gift Card';
-$lang['sales_register']='Daftar Penjualan';
-$lang['sales_mode']='Mode Daftar';
+$lang['sales_giftcard_number'] = 'Gift Card Number';
+$lang['sales_giftcard'] = 'Gift Card';
+$lang['sales_register'] = 'Daftar Penjualan';
+$lang['sales_mode'] = 'Mode Daftar';
 $lang['sales_new_item'] = 'Item baru';
 $lang['sales_item_name'] = 'Nama item ';
 $lang['sales_item_number'] = 'Item #';
 $lang['sales_new_customer'] = 'Pelanggan Baru';
 $lang['sales_customer'] = 'Pelanggan';
-$lang['sales_no_items_in_cart']='Tidak ada item dalam keranjang';
-$lang['sales_total']='Total';
-$lang['sales_tax_percent']='Pajak %';
-$lang['sales_price']='Harga';
-$lang['sales_quantity']='Jumlah.';
-$lang['sales_discount']='Diskon %';
-$lang['sales_edit']='Ubah';
-$lang['sales_payment']='Jenis Pembayaran';
-$lang['sales_edit_item']='Ubah Item';
-$lang['sales_find_or_scan_item']='Cari/Scan Item';
-$lang['sales_find_or_scan_item_or_receipt']='Cari/Scan Item ATAU Bon';
-$lang['sales_select_customer']='Pilih Pelanggan (Opsional)';
-$lang['sales_start_typing_item_name']='Mulai ketik nama item atau scan barcode...';
-$lang['sales_start_typing_customer_name']='Mulai ketik nama pelanggan...';
-$lang['sales_sub_total']='Sub Total';
-$lang['sales_tax']='Pajak';
-$lang['sales_comment']='Catatan';
-$lang['sales_unable_to_add_item']='Tidak dapat menambahkan item dengan penjualan';
-$lang['sales_sale_for_customer']='Pelanggan:';
-$lang['sales_remove_customer']='Hapus Pelanggan';
-$lang['sales_error_editing_item']='Error mengubah item';
-$lang['sales_complete_sale']='Entri penjualan';
-$lang['sales_cancel_sale']='Cancel Sale';
-$lang['sales_add_payment']='Add Payment';
-$lang['sales_receipt']='Bon penjualan';
-$lang['sales_id']='ID Penjualan';
-$lang['sales_sale']='Penjualan';
-$lang['sales_return']='Retur';
+$lang['sales_no_items_in_cart'] = 'Tidak ada item dalam keranjang';
+$lang['sales_total'] = 'Total';
+$lang['sales_tax_percent'] = 'Pajak %';
+$lang['sales_price'] = 'Harga';
+$lang['sales_quantity'] = 'Jumlah.';
+$lang['sales_discount'] = 'Diskon %';
+$lang['sales_edit'] = 'Ubah';
+$lang['sales_payment'] = 'Jenis Pembayaran';
+$lang['sales_edit_item'] = 'Ubah Item';
+$lang['sales_find_or_scan_item'] = 'Cari/Scan Item';
+$lang['sales_find_or_scan_item_or_receipt'] = 'Cari/Scan Item ATAU Bon';
+$lang['sales_select_customer'] = 'Pilih Pelanggan (Opsional)';
+$lang['sales_start_typing_item_name'] = 'Mulai ketik nama item atau scan barcode...';
+$lang['sales_start_typing_customer_name'] = 'Mulai ketik nama pelanggan...';
+$lang['sales_sub_total'] = 'Sub Total';
+$lang['sales_tax'] = 'Pajak';
+$lang['sales_comment'] = 'Catatan';
+$lang['sales_unable_to_add_item'] = 'Tidak dapat menambahkan item dengan penjualan';
+$lang['sales_sale_for_customer'] = 'Pelanggan:';
+$lang['sales_remove_customer'] = 'Hapus Pelanggan';
+$lang['sales_error_editing_item'] = 'Error mengubah item';
+$lang['sales_complete_sale'] = 'Entri penjualan';
+$lang['sales_cancel_sale'] = 'Cancel Sale';
+$lang['sales_add_payment'] = 'Add Payment';
+$lang['sales_receipt'] = 'Bon penjualan';
+$lang['sales_id'] = 'ID Penjualan';
+$lang['sales_sale'] = 'Penjualan';
+$lang['sales_return'] = 'Retur';
 $lang['sales_confirm_finish_sale'] = 'Anda yakin Anda ingin mengirimkan penjualan ini? Proses tidak dapat dibatalkan.';
 $lang['sales_confirm_cancel_sale'] = 'Anda yakin Anda ingin menghapus transaksi penjualan ini? Semua item akan dihapus';
 $lang['sales_cash'] = 'Tunai';
 $lang['sales_check'] = 'Cek';
 $lang['sales_debit'] = 'Kartu Debit';
 $lang['sales_credit'] = 'Kartu Credit';
+$lang['sales_giftcard'] = 'Gift Card';
 $lang['sales_amount_tendered'] = 'Nilai Pembayaran';
 $lang['sales_change_due'] = 'Piutang';
 $lang['sales_payment_not_cover_total'] = 'Payment Amount does not cover Total';
@@ -61,7 +62,6 @@ $lang['sales_successfully_deleted'] = 'Sale sucessfully deleted';
 $lang['sales_unsuccessfully_deleted'] = 'Sale unsucessfully 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_date'] = 'Sale Date';
 $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';
@@ -69,10 +69,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/id/suppliers_lang.php b/application/language/id/suppliers_lang.php
new file mode 100644
index 000000000..d38485dac
--- /dev/null
+++ b/application/language/id/suppliers_lang.php
@@ -0,0 +1,17 @@
+<?php
+$lang['suppliers_new'] = 'Pemasok Baru';
+$lang['suppliers_supplier'] = 'Pemasok';
+$lang['suppliers_update'] = 'Update Pemasok';
+$lang['suppliers_confirm_delete'] = 'Apakah Anda yakin ingin menghapus pemasok yang dipilih?';
+$lang['suppliers_none_selected'] = 'Anda belum memilih pemasok untuk menghapus';
+$lang['suppliers_error_adding_updating'] = 'Error menambah / memperbarui pemasok';
+$lang['suppliers_successful_adding'] = 'Anda telah berhasil menambahkan pemasok';
+$lang['suppliers_successful_updating'] = 'Anda telah berhasil memperbarui pemasok';
+$lang['suppliers_successful_deleted'] = 'Anda telah berhasil menghapus pemasok';
+$lang['suppliers_one_or_multiple'] = 'pemasok';
+$lang['suppliers_cannot_be_deleted'] = 'Tidak bisa dihapus pemasok yang dipilih, satu atau lebih dari pemasok yang dipilih memiliki penjualan.';
+$lang['suppliers_basic_information'] = 'Informasi Pemasok ';
+$lang['suppliers_account_number'] = 'Nomor Akun';
+$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/dutch/.site_lang.php.swp b/application/language/nl-BE/.site_lang.php.swp
similarity index 100%
rename from application/language/dutch/.site_lang.php.swp
rename to application/language/nl-BE/.site_lang.php.swp
diff --git a/application/language/dutch/common_lang.php b/application/language/nl-BE/common_lang.php
similarity index 100%
rename from application/language/dutch/common_lang.php
rename to application/language/nl-BE/common_lang.php
diff --git a/application/language/nl-BE/config_lang.php b/application/language/nl-BE/config_lang.php
new file mode 100755
index 000000000..96aedb140
--- /dev/null
+++ b/application/language/nl-BE/config_lang.php
@@ -0,0 +1,36 @@
+<?php
+$lang['config_info'] = 'Configuratie Informatie';
+$lang['config_company'] = 'Bedrijfsnaam';
+$lang['config_address'] = 'Adres';
+$lang['config_phone'] = 'Telefoon';
+$lang['config_website'] = 'Website';
+$lang['config_fax'] = 'Fax';
+$lang['config_default_tax_rate'] = 'Standaard VAT %';
+$lang['config_default_tax_rate_1'] = 'VAT 1 %';
+$lang['config_default_tax_rate_2'] = 'VAT 2 %';
+$lang['config_company_required'] = 'De bedrijfsnaam moet ingevuld worden';
+$lang['config_address_required'] = 'Het adres van het bedrijf moet ingevuld worden';
+$lang['config_phone_required'] = 'De telefoonnummer van het bedrijf moet ingevuld worden';
+$lang['config_default_tax_rate_required'] = 'Het percentage VAT moet ingevuld worden';
+$lang['config_default_tax_rate_number'] = 'Het percentage VAT moet een nummer zijn';
+$lang['config_company_website_url'] = 'De website van het bedrijf is geen geldige URL (http://...)';
+$lang['config_saved_successfully'] = 'Configuratie werd bewaard';
+$lang['config_saved_unsuccessfully'] = 'Configuratie kon niet worden bewaard';
+$lang['config_return_policy_required'] = 'De retourvoorwaarden moeten ingevuld worden';
+$lang['config_print_after_sale'] = 'Druk ticket na verkoop';
+$lang['config_language'] = 'Taal';
+$lang['config_timezone'] = 'Tijdzone';
+$lang['config_currency_symbol'] = 'Valuta';
+$lang['config_currency_side'] = 'Rechterkant'; //GARRISON ADDED 4/20/2013
+$lang['config_custom1'] = 'Custom Veld 1'; //GARRISON ADDED 4/21/2013
+$lang['config_custom2'] = 'Custom Veld 2'; //GARRISON ADDED 4/21/2013
+$lang['config_custom3'] = 'Custom Veld 3'; //GARRISON ADDED 4/21/2013
+$lang['config_custom4'] = 'Custom Veld 4'; //GARRISON ADDED 4/21/2013
+$lang['config_custom5'] = 'Custom Veld 5'; //GARRISON ADDED 4/21/2013
+$lang['config_custom6'] = 'Custom Veld 6'; //GARRISON ADDED 4/21/2013
+$lang['config_custom7'] = 'Custom Veld 7'; //GARRISON ADDED 4/21/2013
+$lang['config_custom8'] = 'Custom Veld 8'; //GARRISON ADDED 4/21/2013
+$lang['config_custom9'] = 'Custom Veld 9'; //GARRISON ADDED 4/21/2013
+$lang['config_custom10'] = 'Custom Veld 10'; //GARRISON ADDED 4/21/2013
+$lang['config_tax_included'] = 'VAT Ingebgrepen';
+?>
diff --git a/application/language/dutch/customers_lang.php b/application/language/nl-BE/customers_lang.php
similarity index 100%
rename from application/language/dutch/customers_lang.php
rename to application/language/nl-BE/customers_lang.php
diff --git a/application/language/dutch/employees_lang.php b/application/language/nl-BE/employees_lang.php
similarity index 100%
rename from application/language/dutch/employees_lang.php
rename to application/language/nl-BE/employees_lang.php
diff --git a/application/language/dutch/error_lang.php b/application/language/nl-BE/error_lang.php
similarity index 100%
rename from application/language/dutch/error_lang.php
rename to application/language/nl-BE/error_lang.php
diff --git a/application/language/nl-BE/form_validation_lang.php b/application/language/nl-BE/form_validation_lang.php
new file mode 100644
index 000000000..49b3513c7
--- /dev/null
+++ b/application/language/nl-BE/form_validation_lang.php
@@ -0,0 +1,28 @@
+<?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['regex_match']		= "Het %s veld werd niet in het correcte formaat ingevuld.";
+$lang['matches'] = 'De waarde van het "%s" veld is niet gelijk aan de waarde van het "%s" veld.';
+$lang['is_unique'] 			= "Het %s veld moet een unieke waarde bevatten.";
+$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.';
+$lang['decimal']			= "Het %s veld moet een getal zijn.";
+$lang['less_than']			= "Het %s veld moet een getal zijn kleiner dan %s.";
+$lang['greater_than']		= "Het %s veld moet een getal zijn groter dan 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/application/language/nl-BE/giftcards_lang.php b/application/language/nl-BE/giftcards_lang.php
new file mode 100644
index 000000000..e93dbf9e1
--- /dev/null
+++ b/application/language/nl-BE/giftcards_lang.php
@@ -0,0 +1,69 @@
+<?php
+$lang['giftcards_giftcard_number'] = 'Cadeaubon Nummer';
+$lang['giftcards_card_value'] = 'Waarde';
+$lang['giftcards_basic_information'] = 'Cadeaubon Info';
+$lang['giftcards_number_required'] = 'Cadeaubon Nummer is een verplicht veld';
+$lang['giftcards_value_required'] = 'Cadeaubon Waarde is een verplicht veld';
+$lang['giftcards_number'] = 'Cadeaubon Nummer moet een getal zijn';
+$lang['giftcards_value'] = 'Cadeaubon Waarde moet een getal zijn';
+$lang['giftcards_person_id'] = 'Klant';
+$lang['giftcards_retrive_giftcard_info'] = 'Haal Info Op';
+$lang['giftcards_description'] = 'Omschrijving';
+$lang['giftcards_amazon'] = 'Amazon';
+$lang['giftcards_upc_database'] = 'UPC Database';
+$lang['giftcards_cannot_find_giftcard'] = 'Kan geen cadeaubon niet vinden';
+$lang['giftcards_info_provided_by'] = 'Info afgeleverd door';
+$lang['giftcards_number_information'] = 'Cadeaubon Nummer';
+$lang['giftcards_new'] = 'Nieuwe Cadeaubon';
+$lang['giftcards_update'] = 'Bewaar Cadeaubon';
+$lang['giftcards_giftcard'] = 'Cadeaubon';
+$lang['giftcards_edit_multiple_giftcards'] = 'Bewerk meedere cadeaubons';
+$lang['giftcards_category'] = 'Categorie';
+$lang['giftcards_cost_price'] = 'Aankoopprijs';
+$lang['giftcards_unit_price'] = 'Verkoopsprijs';
+$lang['giftcards_tax_1'] = 'VAT';
+$lang['giftcards_tax_2'] = 'VAT 2';
+$lang['giftcards_sales_tax_1'] = 'VAT';
+$lang['giftcards_sales_tax_2'] = 'VAT 2';
+$lang['giftcards_tax_percent'] = 'VAT %';
+$lang['giftcards_tax_percents'] = 'VAT Percentages';
+$lang['giftcards_reorder_level'] = 'Reorder Level';
+$lang['giftcards_quantity'] = 'In stock';
+$lang['giftcards_no_giftcards_to_display'] = 'Er werden geen cadeaubons gevonden';
+$lang['giftcards_bulk_edit'] = 'Bewerk Selectie';
+$lang['giftcards_confirm_delete'] = 'Bent u zeker dat u de geselecteerde cadeaubons wil verwijderen?';
+$lang['giftcards_none_selected'] = 'U hebt geen cadeaubons geselecteerd';
+$lang['giftcards_confirm_bulk_edit'] = 'Bent u zeker dat u de geselecteerde cadeaubons wil aanpassen?';
+$lang['giftcards_successful_bulk_edit'] = 'Cadeaubons werden succesvol bewaard';
+$lang['giftcards_error_updating_multiple'] = 'Fout bij het bewaren van cadeaubons';
+$lang['giftcards_edit_fields_you_want_to_update'] = 'Bewerk de velden die u wil aanpassen voor ALLE geselecteerde cadeaubons';
+$lang['giftcards_error_adding_updating'] = 'Fout bij het bewaren van cadeaubons';
+$lang['giftcards_successful_adding'] = 'Cadeaubon succesvol toegevoegd';
+$lang['giftcards_successful_updating'] = 'Wijzigingen bewaard voor';
+$lang['giftcards_successful_deleted'] = 'Er werd(en)';
+$lang['giftcards_one_or_multiple'] = 'cadeaubon(s) verwijderd';
+$lang['giftcards_cannot_be_deleted'] = 'De cadeaubons konden niet worden verwijderd.';
+$lang['giftcards_none'] = 'Geen';
+$lang['giftcards_supplier'] = 'Leverancier';
+$lang['giftcards_generate_barcodes'] = 'Genereer Barcodes';
+$lang['giftcards_must_select_giftcard_for_barcode'] = 'U moet tenminste 1 cadeuabon selecteren om een barcode te genereren';
+$lang['giftcards_excel_import_failed'] = 'Excel import mislukt';
+$lang['giftcards_allow_alt_description'] = 'Aanpasbare omschrijving';
+$lang['giftcards_is_serialized'] = 'Optelbaar';
+$lang['giftcards_low_inventory_giftcards'] = 'Cadeaubons niet in stock';
+$lang['giftcards_serialized_giftcards'] = 'Optelbare cadeaubons';
+$lang['giftcards_no_description_giftcards'] = 'Cadeaubons zonder omschrijving';
+$lang['giftcards_inventory_comments'] = 'Commentaar';
+$lang['giftcards_count'] = 'Update Stock';
+$lang['giftcards_details_count'] = 'Stockgegevens';
+$lang['giftcards_add_minus'] = 'Corrigatie hoeveelheid';
+$lang['giftcards_current_quantity'] = 'Huidige hoeveelheid';
+$lang['giftcards_quantity_required'] = 'Hoeveelheid moet ingevuld worden. Druk Sluit ( X ) om te annuleren';
+$lang['giftcards_do_nothing'] = 'Doe niets';
+$lang['giftcards_change_all_to_serialized'] = 'Genummerd';
+$lang['giftcards_change_all_to_unserialized'] = 'Niet genummerd';
+$lang['giftcards_change_all_to_allow_alt_desc'] = 'Aanpasb. omschrijvingen';
+$lang['giftcards_change_all_to_not_allow_allow_desc'] = 'Vast omschrijvingen';
+$lang['giftcards_use_inventory_menu'] = 'Use Inv. Menu';
+$lang['giftcards_manually_editing_of_quantity'] = 'Manuele aanpassing hoeveelheid';
+?>
\ No newline at end of file
diff --git a/application/language/dutch/index.html b/application/language/nl-BE/index.html
old mode 100755
new mode 100644
similarity index 93%
rename from application/language/dutch/index.html
rename to application/language/nl-BE/index.html
index c942a79ce..7f684dff4
--- a/application/language/dutch/index.html
+++ b/application/language/nl-BE/index.html
@@ -7,4 +7,4 @@
 <p>Directory access is forbidden.</p>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/application/language/dutch/item_kits_lang.php b/application/language/nl-BE/item_kits_lang.php
similarity index 100%
rename from application/language/dutch/item_kits_lang.php
rename to application/language/nl-BE/item_kits_lang.php
diff --git a/application/language/nl-BE/items_lang.php b/application/language/nl-BE/items_lang.php
new file mode 100755
index 000000000..cf69972c1
--- /dev/null
+++ b/application/language/nl-BE/items_lang.php
@@ -0,0 +1,82 @@
+<?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_reorder_level'] = 'Reorder Level';
+$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_description'] = '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';
+$lang['items_is_deleted'] = 'Verwijderd';// Parq 131215
+?>
diff --git a/application/language/dutch/items_lang.php~ b/application/language/nl-BE/items_lang.php~
similarity index 100%
rename from application/language/dutch/items_lang.php~
rename to application/language/nl-BE/items_lang.php~
diff --git a/application/language/nl-BE/login_lang.php b/application/language/nl-BE/login_lang.php
new file mode 100755
index 000000000..2cf132f89
--- /dev/null
+++ b/application/language/nl-BE/login_lang.php
@@ -0,0 +1,8 @@
+<?php
+$lang['login_login'] = 'Login';
+$lang['login_username'] = 'Gebruiker';
+$lang['login_password'] = 'Paswoord';
+$lang['login_go'] = 'Verstuur';
+$lang['login_invalid_username_and_password'] = 'Ongeldige gebruiker/paswoord';
+$lang['login_welcome_message'] = 'Welkom in deze module. Voer gebruikersnaam en paswoord in om verder te gaan.';
+?>
diff --git a/application/language/nl-BE/module_lang.php b/application/language/nl-BE/module_lang.php
new file mode 100755
index 000000000..5d7f57da2
--- /dev/null
+++ b/application/language/nl-BE/module_lang.php
@@ -0,0 +1,34 @@
+<?php
+$lang['module_home'] = 'Home';
+
+$lang['module_customers'] = 'Klanten';
+$lang['module_customers_desc'] = 'Zoek, bewerk, verwijder en voeg klanten toe';
+
+$lang['module_suppliers'] = 'Leveranciers';
+$lang['module_suppliers_desc'] = 'Zoek, bewerk, verwijder en voeg leveranciers toe';
+
+$lang['module_employees'] = 'Werknemers';
+$lang['module_employees_desc'] = 'Zoek, bewerk, verwijder en voeg werknemers toe';
+
+$lang['module_sales'] = 'Kassa';
+$lang['module_sales_desc'] = 'Verwerk aankopen en retours';
+
+$lang['module_reports'] = 'Rapporten';
+$lang['module_reports_desc'] = 'Toon en genereer rapporten';
+
+$lang['module_items'] = 'Producten';
+$lang['module_items_desc'] = 'Zoek, bewerk, verwijder en voeg producten toe';
+
+$lang['module_config'] = 'Configuratie';
+$lang['module_config_desc'] = 'Globale configuratie aanpassen';
+
+$lang['module_receivings'] = 'Orders';
+$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';
+
+?>
diff --git a/application/language/nl-BE/receivings_lang.php b/application/language/nl-BE/receivings_lang.php
new file mode 100755
index 000000000..5fb8a18cf
--- /dev/null
+++ b/application/language/nl-BE/receivings_lang.php
@@ -0,0 +1,26 @@
+<?php
+$lang['recvs_register'] = 'Orders';
+$lang['recvs_mode'] = 'Order type';
+$lang['recvs_receiving'] = 'Inkoop';
+$lang['recvs_return'] = 'Teruggave';
+$lang['recvs_total'] = 'Totaal';
+$lang['recvs_cost'] = 'Kost';
+$lang['recvs_quantity'] = 'Aantal';
+$lang['recvs_discount'] = 'Korting %';
+$lang['recvs_edit'] = 'Bewerk';
+$lang['recvs_new_supplier'] = 'N. Leverancier';
+$lang['recvs_supplier'] = 'Leverancier';
+$lang['recvs_select_supplier'] = 'Selecteer Leverancier (Optioneel)';
+$lang['recvs_start_typing_supplier_name'] = 'Typ naam leverancier..';
+$lang['recvs_unable_to_add_item'] = 'Onmogelijk om product aan order toe te voegen';
+$lang['recvs_error_editing_item'] = 'Fout bij het bewerken product';
+$lang['recvs_receipt'] = 'Ontvangstbewijs';
+$lang['recvs_complete_receiving'] = 'Bevestig';
+$lang['recvs_confirm_finish_receiving'] = 'Bent u zeker dat u dit order wil ingeven? Dit kan niet ongedaan gemaakt worden.';
+$lang['recvs_confirm_cancel_receiving'] = 'Bent u zeker dat u dit order wil wissen?';
+$lang['recvs_find_or_scan_item'] = 'Zoek/Scan Product';
+$lang['recvs_find_or_scan_item_or_receipt'] = 'Zoek/Scan Product OF Tickets';
+$lang['recvs_id'] = 'Ordernummer';
+$lang['recvs_item_name'] = 'Productnaam';
+$lang['receivings_transaction_failed'] = 'Order transactie mislukt';
+?>
diff --git a/application/language/dutch/reports_lang.php b/application/language/nl-BE/reports_lang.php
similarity index 100%
rename from application/language/dutch/reports_lang.php
rename to application/language/nl-BE/reports_lang.php
diff --git a/application/language/dutch/sales_lang.php b/application/language/nl-BE/sales_lang.php
similarity index 100%
rename from application/language/dutch/sales_lang.php
rename to application/language/nl-BE/sales_lang.php
diff --git a/application/language/dutch/suppliers_lang.php b/application/language/nl-BE/suppliers_lang.php
similarity index 100%
rename from application/language/dutch/suppliers_lang.php
rename to application/language/nl-BE/suppliers_lang.php
diff --git a/application/language/ru/common_lang.php b/application/language/ru/common_lang.php
new file mode 100644
index 000000000..beaa1681b
--- /dev/null
+++ b/application/language/ru/common_lang.php
@@ -0,0 +1,41 @@
+<?php
+$lang['common_common'] = 'общественно';
+$lang['common_submit'] = 'Подавать';
+$lang['common_or'] = 'ИЛИ';
+$lang['common_powered_by'] = 'самоходные из';
+$lang['common_welcome'] = 'Добро пожаловать';
+$lang['common_logout'] = 'Выход';
+$lang['common_list_of'] = 'Список';
+$lang['common_first_name'] = 'Имя';
+$lang['common_last_name'] = 'Фамилия';
+$lang['common_email'] = 'Электронная почта';
+$lang['common_phone_number'] = 'Номер телефона';
+$lang['common_address_1'] = 'Адрес 1';
+$lang['common_address_2'] = 'Адрес 2';
+$lang['common_city'] = 'Город';
+$lang['common_state'] = 'Штат';
+$lang['common_zip'] = 'Почтовый индекс';
+$lang['common_country'] = 'Страна';
+$lang['common_comments'] = 'Комментарии';
+$lang['common_edit'] = 'редактировать';
+$lang['common_search'] = 'Пойск';
+$lang['common_delete'] = 'Удалить';
+$lang['common_remove'] = 'Снимать';
+$lang['common_view_recent_sales'] = 'Посмотреть Недавние Продажи';
+$lang['common_you_are_using_ospos'] = 'Вы использоваете Open Source Point Of Sale Версия';
+$lang['common_please_visit_my'] = 'пожалуйста, посетите';
+$lang['common_website'] = 'веб-сайт';
+$lang['common_fields_required_message'] = 'Красные пробела обязательно';
+$lang['common_learn_about_project'] = ', чтобы узнать самую последнюю информацию о проекте';
+$lang['common_searched_for'] = 'Искали за';
+$lang['common_first_name_required'] = 'Имя обязательный пробел';
+$lang['common_last_name_required'] = 'Фамилия обязательный пробел';
+$lang['common_email_invalid_format'] = 'Это электронная почта не в нужный формат';
+$lang['common_confirm_search'] = 'Вы выбрали одну или несколько строк, это больше не будет быть выбрано после поиска. Вы уверены, что хотите, чтобы представить этот поиск?';
+$lang['common_no_persons_to_display'] = 'Там нет людей, чтобы отобразить';
+$lang['common_return_policy'] = 'Возвратний полис';
+$lang['common_price'] = 'Цена';
+$lang['common_welcome_message']= 'Добро пожаловать в Open Source Point Of Sale, нажмите модуля ниже, чтобы начать!';
+$lang['common_inv'] = 'инв';
+$lang['common_det'] = 'детали';
+?>
\ No newline at end of file
diff --git a/application/language/ru/config_lang.php b/application/language/ru/config_lang.php
new file mode 100644
index 000000000..63b0e6689
--- /dev/null
+++ b/application/language/ru/config_lang.php
@@ -0,0 +1,36 @@
+<?php
+$lang['config_info'] = 'информация о магазин конфигурация';
+$lang['config_company'] = 'Название Компании';
+$lang['config_address'] = 'Адрес Компании';
+$lang['config_phone'] = 'Телефон Компании';
+$lang['config_website'] = 'Веб-сайт';
+$lang['config_fax'] = 'Факс';
+$lang['config_default_tax_rate'] = 'Обычный ставка налога %';
+$lang['config_default_tax_rate_1'] = 'ставка налога 1';
+$lang['config_default_tax_rate_2'] = 'ставка налога 2';
+$lang['config_company_required'] = 'Имя Компании обязательный пробел';
+$lang['config_address_required'] = 'Адрес Компании обязательный пробел';
+$lang['config_phone_required'] = 'Телефон Компании обязательный пробел';
+$lang['config_default_tax_rate_required'] = 'Обычный ставка налога обязательный пробел';
+$lang['config_default_tax_rate_number'] = 'Обычный ставка налога должен быть цифра';
+$lang['config_company_website_url'] = 'Веб-сайт Компании не является допустимым URL (http://...)';
+$lang['config_saved_successfully'] = 'Конфигурация успешно сохранена';
+$lang['config_saved_unsuccessfully'] = 'Конфигурация сохраненная безуспешно';
+$lang['config_return_policy_required'] = 'Возвратний полис обязательный пробел';
+$lang['config_print_after_sale'] = 'Распечатать квитанцию ​​после продажи';
+$lang['config_language'] = 'Язик';
+$lang['config_timezone'] = 'Часовой пояс';
+$lang['config_currency_symbol'] = 'Символ валюты';
+$lang['config_currency_side'] = 'Правая сторона'; //GARRISON ADDED 4/20/2013
+$lang['config_custom1'] = 'Изготовленный пробел 1'; //GARRISON ADDED 4/21/2013
+$lang['config_custom2'] = 'Изготовленный пробел 2'; //GARRISON ADDED 4/21/2013
+$lang['config_custom3'] = 'Изготовленный пробел 3'; //GARRISON ADDED 4/21/2013
+$lang['config_custom4'] = 'Изготовленный пробел 4'; //GARRISON ADDED 4/21/2013
+$lang['config_custom5'] = 'Изготовленный пробел 5'; //GARRISON ADDED 4/21/2013
+$lang['config_custom6'] = 'Изготовленный пробел 6'; //GARRISON ADDED 4/21/2013
+$lang['config_custom7'] = 'Изготовленный пробел 7'; //GARRISON ADDED 4/21/2013
+$lang['config_custom8'] = 'Изготовленный пробел 8'; //GARRISON ADDED 4/21/2013
+$lang['config_custom9'] = 'Изготовленный пробел 9'; //GARRISON ADDED 4/21/2013
+$lang['config_custom10'] = 'Изготовленный пробел 10'; //GARRISON ADDED 4/21/2013
+$lang['config_tax_included'] = 'Tax Included';
+?>
\ No newline at end of file
diff --git a/application/language/ru/customers_lang.php b/application/language/ru/customers_lang.php
new file mode 100644
index 000000000..f82ff8ee5
--- /dev/null
+++ b/application/language/ru/customers_lang.php
@@ -0,0 +1,16 @@
+<?php
+$lang['customers_new'] = 'Новый Клиент';
+$lang['customers_customer'] = 'Клиент';
+$lang['customers_update'] = 'Обновлять Клиент';
+$lang['customers_confirm_delete'] = 'Вы уверены, что хотите удалить выбранных клиентов?';
+$lang['customers_none_selected'] = 'Вы не выбрали ни клиентов, чтобы удалить.';
+$lang['customers_error_adding_updating'] = 'Ошибка при добавлении/обновлении клиента';
+$lang['customers_successful_adding'] = 'Вы успешно добавили клиентов';
+$lang['customers_successful_updating'] = 'Вы успешно обновили клиент';
+$lang['customers_successful_deleted'] = 'Вы успешно удалили';
+$lang['customers_one_or_multiple'] = 'клиент(ов)';
+$lang['customers_cannot_be_deleted'] = 'Невозможно удалить выбранных клиентов, один или более из них имеет продаж.';
+$lang['customers_basic_information'] = 'Информация о клиенте';
+$lang['customers_account_number'] = 'Номер счота';
+$lang['customers_taxable'] = 'облагаемый';
+?>
diff --git a/application/language/ru/employees_lang.php b/application/language/ru/employees_lang.php
new file mode 100644
index 000000000..0feb5ced9
--- /dev/null
+++ b/application/language/ru/employees_lang.php
@@ -0,0 +1,27 @@
+<?php
+$lang['employees_employee'] = 'Сотрудник';
+$lang['employees_new'] = 'Новый Сотрудник';
+$lang['employees_update'] = 'Обновлять Сотрудник';
+$lang['employees_confirm_delete'] = 'Вы уверены, что хотите удалить выбранную сотрудников?';
+$lang['employees_none_selected'] = 'Вы не выбрали ни сотрудников для удаления';
+$lang['employees_error_adding_updating'] = 'Ошибка при добавлении/обновлении сотрудника';
+$lang['employees_successful_adding'] = 'Вы успешно добавили сотрудника';
+$lang['employees_successful_updating'] = 'Вы успешно обновили сотрудника';
+$lang['employees_successful_deleted'] = 'Вы успешно удалили';
+$lang['employees_one_or_multiple'] = 'сотрудник(ов)';
+$lang['employees_cannot_be_deleted'] = 'Не возможно удалить выбранный сотрудников, одного или более работников обработал продаж или вы пытаетесь удалить себя';
+$lang['employees_username'] = 'Имя пользователя';
+$lang['employees_password'] = 'Пароль';
+$lang['employees_repeat_password'] = 'Повторяете пароль';
+$lang['employees_username_required'] = 'Имя пользователи обязательный пробел';
+$lang['employees_username_minlength'] = 'Имя пользователя должна быть не менее 5 символов';
+$lang['employees_password_required'] = 'Пароль обязательно';
+$lang['employees_password_minlength'] = 'Пароль должен быть не менее 8 символов';
+$lang['employees_password_must_match'] = 'Пароли не совпадают';
+$lang['employees_basic_information'] = 'Сотрудник Базовая Информация';
+$lang['employees_login_info'] = 'Информация для сотрудников Входа';
+$lang['employees_permission_info'] = 'Сотрудник разрешениями и правами доступа';
+$lang['employees_permission_desc'] = 'Отметьте флажками ниже, чтобы предоставить доступ к модулям';
+$lang['employees_error_updating_demo_admin'] = 'Вы не можете изменить пользователь демонстрация аккаунт';
+$lang['employees_error_deleting_demo_admin'] = 'Вы не можете удалить пользователь демонстрация аккаунт';
+?>
diff --git a/application/language/ru/error_lang.php b/application/language/ru/error_lang.php
new file mode 100644
index 000000000..2d13b3219
--- /dev/null
+++ b/application/language/ru/error_lang.php
@@ -0,0 +1,4 @@
+<?php
+$lang['error_no_permission_module'] = 'У вас нет разрешения на доступ к модуля называется';
+$lang['error_unknown'] = 'неизвестный';
+?>
\ No newline at end of file
diff --git a/application/language/ru/form_validation_lang.php b/application/language/ru/form_validation_lang.php
new file mode 100644
index 000000000..3418f29ab
--- /dev/null
+++ b/application/language/ru/form_validation_lang.php
@@ -0,0 +1,29 @@
+<?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/application/language/ru/giftcards_lang.php b/application/language/ru/giftcards_lang.php
new file mode 100644
index 000000000..ac38e7e8e
--- /dev/null
+++ b/application/language/ru/giftcards_lang.php
@@ -0,0 +1,69 @@
+<?php
+$lang['giftcards_giftcard_number'] = 'Номер Подарочную карту';
+$lang['giftcards_card_value'] = 'стоимость';
+$lang['giftcards_basic_information'] = 'информация Подарочную карту';
+$lang['giftcards_number_required'] = 'Номер Подарочную карту обязательный пробел';
+$lang['giftcards_value_required'] = 'стоимость Подарочную карту обязательный пробел';
+$lang['giftcards_number'] = 'Номер Подарочную карту должна быть цифрая';
+$lang['giftcards_value'] = 'стоимость Подарочную карту должна быть цифрая';
+$lang['giftcards_person_id'] = 'Клиент';
+$lang['giftcards_retrive_giftcard_info'] = 'находить и подавать информация Подарочную карту';
+$lang['giftcards_description'] = 'Описание';
+$lang['giftcards_amazon'] = 'Amazon';
+$lang['giftcards_upc_database'] = 'UPC база данных';
+$lang['giftcards_cannot_find_giftcard'] = 'Не можете найти любую информацию о Подарочную карту';
+$lang['giftcards_info_provided_by'] = 'Информация предоставлена';
+$lang['giftcards_number_information'] = 'Номер Подарочную карту';
+$lang['giftcards_new'] = 'Новая Подарочная карта';
+$lang['giftcards_update'] = 'Обновлять Подарочная карта';
+$lang['giftcards_giftcard'] = 'Подарочная карта';
+$lang['giftcards_edit_multiple_giftcards'] = 'Редактирование нескольких Подарочные карты';
+$lang['giftcards_category'] = 'категория';
+$lang['giftcards_cost_price'] = 'Оптовая Цена';
+$lang['giftcards_unit_price'] = 'Розничная Цена';
+$lang['giftcards_tax_1'] = 'Налог 1';
+$lang['giftcards_tax_2'] = 'Налог 2';
+$lang['giftcards_sales_tax_1'] = 'Налог с продаж';
+$lang['giftcards_sales_tax_2'] = 'Налог с продаж 2';
+$lang['giftcards_tax_percent'] = 'процент налога';
+$lang['giftcards_tax_percents'] = 'процент налога';
+$lang['giftcards_reorder_level'] = 'минимальный уровень для перезаказ';
+$lang['giftcards_quantity'] = 'Количество';
+$lang['giftcards_no_giftcards_to_display'] = 'Нет Подарочные карты для отображения';
+$lang['giftcards_bulk_edit'] = 'Массовое изменение';
+$lang['giftcards_confirm_delete'] = 'Вы уверены, что хотите удалить выбранную Подарочные карты?';
+$lang['giftcards_none_selected'] = 'Вы не выбрали ни Подарочные карты для редактирования';
+$lang['giftcards_confirm_bulk_edit'] = 'Вы уверены, что хотите редактировать все выбранные Подарочные карты?';
+$lang['giftcards_successful_bulk_edit'] = 'Вы успешно обновили выбранной Подарочные карты';
+$lang['giftcards_error_updating_multiple'] = 'Ошибка при обновлении Подарочные карты';
+$lang['giftcards_edit_fields_you_want_to_update'] = 'Отредактируйте поля вы хотите изменить для всех выбранных Подарочные карты';
+$lang['giftcards_error_adding_updating'] = 'Ошибка при добавлении/обновлении подарочную карту';
+$lang['giftcards_successful_adding'] = 'Вы успешно добавили подарочную карту';
+$lang['giftcards_successful_updating'] = 'Вы успешно обновили подарочную карту';
+$lang['giftcards_successful_deleted'] = 'Вы успешно удален';
+$lang['giftcards_one_or_multiple'] = 'подарочную карту';
+$lang['giftcards_cannot_be_deleted'] = 'Не удалось удалить выбранные подарочные карты, одну или несколько из выбранных подарочные карты имеет продаж.';
+$lang['giftcards_none'] = 'Ни один';
+$lang['giftcards_supplier'] = 'Поставщик';
+$lang['giftcards_generate_barcodes'] = 'Создание штрих-кодов';
+$lang['giftcards_must_select_giftcard_for_barcode'] = 'Вы должны выбрать хотя бы 1 подарочная карта для создания штрих-кодов';
+$lang['giftcards_excel_import_failed'] = 'Ошибка импорта Excel';
+$lang['giftcards_allow_alt_description'] = 'Разрешить альтернативные Описание';
+$lang['giftcards_is_serialized'] = 'Подарочная карта имеет серийный номер';
+$lang['giftcards_low_inventory_giftcards'] = 'Низкий Подарочные карты инвентаризации';
+$lang['giftcards_serialized_giftcards'] = 'Сериализованные Подарочные карты';
+$lang['giftcards_no_description_giftcards'] = 'Нет Описание Подарочные карты';
+$lang['giftcards_inventory_comments'] = 'Комментарии';
+$lang['giftcards_count'] = 'Обновление перечня';
+$lang['giftcards_details_count'] = 'Подробная инвентаризация';
+$lang['giftcards_add_minus'] = 'Инвентарь для сложения/вычитания';
+$lang['giftcards_current_quantity'] = 'Токовые';
+$lang['giftcards_quantity_required'] = 'Количество является обязательным полем. Пожалуйста, закройте (X), чтобы отменить';
+$lang['giftcards_do_nothing'] = 'Ничего не делать';
+$lang['giftcards_change_all_to_serialized'] = 'Заменить все в сериализованную';
+$lang['giftcards_change_all_to_unserialized'] = 'Чтобы изменить все десериализуются';
+$lang['giftcards_change_all_to_allow_alt_desc'] = 'Разрешить альтернативные Описание Для всех';
+$lang['giftcards_change_all_to_not_allow_allow_desc'] = 'Не позволяйте Альтернативные Описание Для всех';
+$lang['giftcards_use_inventory_menu'] = 'Используйте меню инвентаря';
+$lang['giftcards_manually_editing_of_quantity'] = 'Руководство Изменить количество';
+?>
\ No newline at end of file
diff --git a/application/language/Russian/index.html b/application/language/ru/index.html
similarity index 100%
rename from application/language/Russian/index.html
rename to application/language/ru/index.html
diff --git a/application/language/Russian/item_kits_lang.php b/application/language/ru/item_kits_lang.php
similarity index 100%
rename from application/language/Russian/item_kits_lang.php
rename to application/language/ru/item_kits_lang.php
diff --git a/application/language/ru/items_lang.php b/application/language/ru/items_lang.php
new file mode 100644
index 000000000..7e6639a63
--- /dev/null
+++ b/application/language/ru/items_lang.php
@@ -0,0 +1,81 @@
+<?php
+$lang['items_item_number'] = 'UPC/EAN/ISBN';
+$lang['items_retrive_item_info'] = 'Получить Детальная информация';
+$lang['items_description'] = 'Описание';
+$lang['items_amazon'] = 'Amazon';
+$lang['items_upc_database'] = 'UPC база данных';
+$lang['items_cannot_find_item'] = 'не могу найти любую информацию о товаре';
+$lang['items_info_provided_by'] = 'Информация, представленная';
+$lang['items_basic_information'] = 'информацию о товаре';
+$lang['items_number_information'] = 'Номер Товара';
+$lang['items_new'] = 'Новый Товар';
+$lang['items_update'] = 'Обновить Товар';
+$lang['items_item'] = 'Товар';
+$lang['items_edit_multiple_items'] = 'Редактирование нескольких товаров';
+$lang['items_name'] = 'название товара';
+$lang['items_category'] = 'Категория';
+$lang['items_cost_price'] = 'Оптовая Цена';//GARRISON ADDED 4/21/2013
+$lang['items_unit_price'] = 'Розничная Цена';//GARRISON ADDED 4/21/2013
+$lang['items_tax_1'] = 'Налог 1';
+$lang['items_tax_2'] = 'Налог 2';
+$lang['items_sales_tax_1'] = 'Налог на покупку';
+$lang['items_sales_tax_2'] = 'Налог на покупку 2';
+$lang['items_tax_percent'] = 'процент налога';
+$lang['items_tax_percents'] = 'процент налога(и)';
+$lang['items_reorder_level'] = 'Минимальный уровень перед заказом';
+$lang['items_quantity'] = 'Количество';
+$lang['items_reorder_level'] = 'Минимальный уровень перед заказом';
+$lang['items_no_items_to_display'] = 'Нет товаров для отображения';
+$lang['items_bulk_edit'] = 'Массовое изменение';
+$lang['items_confirm_delete'] = 'Вы уверены, что хотите удалить выбранные товари?';
+$lang['items_none_selected'] = 'Вы не выбрали ни одной товари для редактирования';
+$lang['items_confirm_bulk_edit'] = 'Вы уверены, что хотите редактировать все товари выбраны?';
+$lang['items_successful_bulk_edit'] = 'Вы успешно обновили выбранных товаров';
+$lang['items_error_updating_multiple'] = 'Ошибка при обновлении товаров';
+$lang['items_edit_fields_you_want_to_update'] = 'Отредактируйте пробела вы хотите изменить для всех выбранных товаров';
+$lang['items_error_adding_updating'] = 'Ошибка при добавлении/обновлении товара';
+$lang['items_successful_adding'] = 'Вы успешно добавлен товар';
+$lang['items_successful_updating'] = 'Вы успешно обновленного товара';
+$lang['items_successful_deleted'] = 'Вы успешно удалили';
+$lang['items_one_or_multiple'] = 'товар(а)';
+$lang['items_cannot_be_deleted'] = 'Невозможно удалить выбранные товари, один или более из выбранных товаров имеет продаж.';
+$lang['items_name_required'] = 'Название товара обязательное пробелья';
+$lang['items_category_required'] = 'Категория обязательное пробелья';
+$lang['items_buy_price_required'] = 'Цена покупки обязательное пробелья';
+$lang['items_unit_price_required'] = 'Розничная цена обязательное пробелья';
+$lang['items_cost_price_required'] = 'Оптовая цена обязательное пробелья';
+$lang['items_tax_percent_required'] = 'Процент Налоги обязательное пробелья';
+$lang['items_quantity_required'] = 'Количество обязательное пробелья';
+$lang['items_reorder_level_required'] = 'Минимальный уровень перед заказом обязательное пробелья';
+$lang['items_unit_price_number'] = 'Розничная Цена должно быть число';
+$lang['items_cost_price_number'] = 'Оптовая цена должно быть число';
+$lang['items_quantity_number'] = 'Количество должно быть число';
+$lang['items_reorder_level_number'] = 'Минимальный уровень перед заказом должно быть число';
+$lang['items_none'] = 'Ничего';
+$lang['items_supplier'] = 'Поставщик';
+$lang['items_generate_barcodes'] = 'Создайте штрих-кодов';
+$lang['items_must_select_item_for_barcode'] = 'Вы должны выбрать хотя бы 1 товар для создания штрих-кодов';
+$lang['items_excel_import_failed'] = 'Ошибка импорта Excel';
+$lang['items_allow_alt_description'] = 'Разрешить альтернативные описания';
+$lang['items_is_serialized'] = 'Товар имеет серийный номер';
+$lang['items_low_inventory_items'] = 'Низкий инвентаризации товары';
+$lang['items_serialized_items'] = 'Сериализованные товары';
+$lang['items_no_description_items'] = 'без Описание товары';
+$lang['items_search_custom_items'] = 'Искать в дополнительных товарях';//GARRISON ADDED
+$lang['items_inventory_comments'] = 'Комментарии';
+$lang['items_count'] = 'Обновление инвентории';
+$lang['items_details_count'] = 'детали инвентаризацего количество';
+$lang['items_add_minus'] = 'Инвентарь для сложения/вычитания';
+$lang['items_current_quantity'] = 'Количество Сейчас';
+$lang['items_quantity_required'] = 'Количество обязательное пробелья. Пожалуйста, закройте (X), чтобы отменить';
+$lang['items_do_nothing'] = 'Ничего не делать';
+$lang['items_change_all_to_serialized'] = 'Изменить все в сериализованную';
+$lang['items_change_all_to_unserialized'] = 'Изменить все в несериализованную';
+$lang['items_change_all_to_allow_alt_desc'] = 'Разрешить альтернативные Описание для всех';
+$lang['items_change_all_to_not_allow_allow_desc'] = 'Не разрешить альтернативные Описание для всех';
+$lang['items_use_inventory_menu'] = 'Используйте меню инвентаря';
+$lang['items_manually_editing_of_quantity'] = 'Руководство Изменить количество';
+$lang['items_inventory'] = 'инвентаризация';
+$lang['items_location'] = 'место';
+$lang['items_is_deleted'] = 'Deleted';// Parq 131215
+?>
\ No newline at end of file
diff --git a/application/language/ru/login_lang.php b/application/language/ru/login_lang.php
new file mode 100644
index 000000000..88c4d324b
--- /dev/null
+++ b/application/language/ru/login_lang.php
@@ -0,0 +1,8 @@
+<?php
+$lang['login_login'] = 'Вход';
+$lang['login_username'] = 'Имя';
+$lang['login_password'] = 'Пароль';
+$lang['login_go'] = 'ходите';
+$lang['login_invalid_username_and_password'] = 'Неправелная Имя/Пароль';
+$lang['login_welcome_message'] = 'Добро пожаловать в Open Source Point of Sale. Чтобы продолжить, пожалуйста войдите на сайт, используя имя и пароль.';
+?>
diff --git a/application/language/ru/module_lang.php b/application/language/ru/module_lang.php
new file mode 100644
index 000000000..546567b54
--- /dev/null
+++ b/application/language/ru/module_lang.php
@@ -0,0 +1,34 @@
+<?php
+$lang['module_home'] = 'Дома';
+
+$lang['module_customers'] = 'Клиенты';
+$lang['module_customers_desc'] = 'Добавление, обновление, удаление и поиск клиентов';
+
+$lang['module_suppliers'] = 'Поставщики';
+$lang['module_suppliers_desc'] = 'Добавление, обновление, удаление и поиск suppliers';
+
+$lang['module_employees'] = 'Сотрудники';
+$lang['module_employees_desc'] = 'Добавление, обновление, удаление и поиск сотрудники';
+
+$lang['module_sales'] = 'Продажа';
+$lang['module_sales_desc'] = 'Процесс продажи и возвращается';
+
+$lang['module_reports'] = 'Отчеты';
+$lang['module_reports_desc'] = 'Просмотр и создание отчетов';
+
+$lang['module_items'] = 'Товары';
+$lang['module_items_desc'] = 'Добавление, обновление, удаление и поиск товары';
+
+$lang['module_config'] = 'Конфигурацию магазина';
+$lang['module_config_desc'] = 'Изменить конфигурацию магазина';
+
+$lang['module_receivings'] = 'получении';
+$lang['module_receivings_desc'] = 'Процесс покупки заказов';
+
+$lang['module_giftcards'] = 'Подарочные карты';
+$lang['module_giftcards_desc'] = 'Добавление, обновление, удаление и поиск подарочные карты';
+
+$lang['module_item_kits'] = 'товара комплекти';
+$lang['module_item_kits_desc'] = 'Добавление, обновление, удаление и поиск товара комплекти';
+
+?>
diff --git a/application/language/ru/receivings_lang.php b/application/language/ru/receivings_lang.php
new file mode 100644
index 000000000..c6eb0b72d
--- /dev/null
+++ b/application/language/ru/receivings_lang.php
@@ -0,0 +1,26 @@
+<?php
+$lang['recvs_register'] = 'Получение товаров';
+$lang['recvs_mode'] = 'получая режим';
+$lang['recvs_receiving'] = 'получать';
+$lang['recvs_return'] = 'возвращать';
+$lang['recvs_total'] = 'сумма';
+$lang['recvs_cost'] = 'стоимость';
+$lang['recvs_quantity'] = 'Кол-во.';
+$lang['recvs_discount'] = 'Скидка %';
+$lang['recvs_edit'] = 'редактировать';
+$lang['recvs_new_supplier'] = 'Новый поставщик';
+$lang['recvs_supplier'] = 'поставщик';
+$lang['recvs_select_supplier'] = 'Выберите поставщика (необязательно)';
+$lang['recvs_start_typing_supplier_name'] = 'Начните вводить название поставщика...';
+$lang['recvs_unable_to_add_item'] = 'Невозможно добавить товар на получение';
+$lang['recvs_error_editing_item'] = 'Ошибка редактирования товар';
+$lang['recvs_receipt'] = 'квитанция о получении';
+$lang['recvs_complete_receiving'] = 'заканчивать';
+$lang['recvs_confirm_finish_receiving'] = 'Вы уверены, что хотите представить это получение? Это не может быть отменено.';
+$lang['recvs_confirm_cancel_receiving'] = 'Вы уверены, что хотите удалить это получение? Все детали будут очищены.';
+$lang['recvs_find_or_scan_item'] = 'Найти/Сканировать товар';
+$lang['recvs_find_or_scan_item_or_receipt'] = 'Найти/Сканировать товар ИЛИ квитанция';
+$lang['recvs_id'] = 'получение ID';
+$lang['recvs_item_name'] = 'Название товара';
+$lang['receivings_transaction_failed'] = 'Ошибка Получение транзакции';
+?>
diff --git a/application/language/Russian/reports_lang.php b/application/language/ru/reports_lang.php
similarity index 98%
rename from application/language/Russian/reports_lang.php
rename to application/language/ru/reports_lang.php
index e47cac200..2fd82dab8 100644
--- a/application/language/Russian/reports_lang.php
+++ b/application/language/ru/reports_lang.php
@@ -84,4 +84,5 @@ $lang['reports_detailed_receivings_report'] = 'Детальный отчет о
 $lang['reports_sale_type'] = 'Вид Продажи';
 $lang['reports_all'] = 'все';
 $lang['reports_returns'] = 'Возвраты';
-?>
+$lang['reports_discount'] = 'A discount greater than ';
+?>
\ No newline at end of file
diff --git a/application/language/Russian/sales_lang.php b/application/language/ru/sales_lang.php
similarity index 61%
rename from application/language/Russian/sales_lang.php
rename to application/language/ru/sales_lang.php
index ff9426671..58ca33b26 100644
--- a/application/language/Russian/sales_lang.php
+++ b/application/language/ru/sales_lang.php
@@ -1,41 +1,41 @@
 <?php
-$lang['sales_giftcard_number']='Номер подарочных карт';
-$lang['sales_giftcard']='Подарочная карта';
-$lang['sales_register']='Продажи журнала';
-$lang['sales_mode']='режим журнала';
+$lang['sales_giftcard_number'] = 'Номер подарочных карт';
+$lang['sales_giftcard'] = 'Подарочная карта';
+$lang['sales_register'] = 'Продажи журнала';
+$lang['sales_mode'] = 'режим журнала';
 $lang['sales_new_item'] = 'Новый Товар';
 $lang['sales_item_name'] = 'Название товара';
 $lang['sales_item_number'] = 'Номер товара';
 $lang['sales_new_customer'] = 'Новый клиент';
 $lang['sales_customer'] = 'клиент';
-$lang['sales_no_items_in_cart']='Там нет товаров в корзине';
-$lang['sales_total']='сумма';
-$lang['sales_tax_percent']='Налоговые %';
-$lang['sales_price']='цена';
-$lang['sales_quantity']='Кол-во.';
-$lang['sales_discount']='скидка %';
-$lang['sales_edit']='редактировать';
-$lang['sales_payment']='Вид оплаты';
-$lang['sales_edit_item']='Редактировать Товар';
-$lang['sales_find_or_scan_item']='Найти/Сканировать Товара';
-$lang['sales_find_or_scan_item_or_receipt']='Найти/Сканировать Товара ИЛИ Квитанция';
-$lang['sales_select_customer']='Выберите клиента (необязательно)';
-$lang['sales_start_typing_item_name']='Начните печатать название товара или сканировайте штрих-кода...';
-$lang['sales_start_typing_customer_name']='Начните печатать название клиента...';
-$lang['sales_sub_total']='промежуточный итог';
-$lang['sales_tax']='налог';
-$lang['sales_comment']='комментировать';
-$lang['sales_unable_to_add_item']='Невозможно добавить товар продажи';
-$lang['sales_sale_for_customer']='Клиент:';
-$lang['sales_remove_customer']='Удалите клиентов';
-$lang['sales_error_editing_item']='Ошибка редактирования товара';
-$lang['sales_complete_sale']='Завершить продажу';
-$lang['sales_cancel_sale']='Отменить продажу';
-$lang['sales_add_payment']='Добавить оплаты';
-$lang['sales_receipt']='товарный чек';
-$lang['sales_id']='Номер Продажы';
-$lang['sales_sale']='Продажа';
-$lang['sales_return']='возвращать';
+$lang['sales_no_items_in_cart'] = 'Там нет товаров в корзине';
+$lang['sales_total'] = 'сумма';
+$lang['sales_tax_percent'] = 'Налоговые %';
+$lang['sales_price'] = 'цена';
+$lang['sales_quantity'] = 'Кол-во.';
+$lang['sales_discount'] = 'скидка %';
+$lang['sales_edit'] = 'редактировать';
+$lang['sales_payment'] = 'Вид оплаты';
+$lang['sales_edit_item'] = 'Редактировать Товар';
+$lang['sales_find_or_scan_item'] = 'Найти/Сканировать Товара';
+$lang['sales_find_or_scan_item_or_receipt'] = 'Найти/Сканировать Товара ИЛИ Квитанция';
+$lang['sales_select_customer'] = 'Выберите клиента (необязательно)';
+$lang['sales_start_typing_item_name'] = 'Начните печатать название товара или сканировайте штрих-кода...';
+$lang['sales_start_typing_customer_name'] = 'Начните печатать название клиента...';
+$lang['sales_sub_total'] = 'промежуточный итог';
+$lang['sales_tax'] = 'налог';
+$lang['sales_comment'] = 'комментировать';
+$lang['sales_unable_to_add_item'] = 'Невозможно добавить товар продажи';
+$lang['sales_sale_for_customer'] = 'Клиент:';
+$lang['sales_remove_customer'] = 'Удалите клиентов';
+$lang['sales_error_editing_item'] = 'Ошибка редактирования товара';
+$lang['sales_complete_sale'] = 'Завершить продажу';
+$lang['sales_cancel_sale'] = 'Отменить продажу';
+$lang['sales_add_payment'] = 'Добавить оплаты';
+$lang['sales_receipt'] = 'товарный чек';
+$lang['sales_id'] = 'Номер Продажы';
+$lang['sales_sale'] = 'Продажа';
+$lang['sales_return'] = 'возвращать';
 $lang['sales_confirm_finish_sale'] = 'Вы уверены, что хотите заверщить эту продажу? Не может быть отменено.';
 $lang['sales_confirm_cancel_sale'] = 'Вы уверены, что хотите удалить эту продажу? Все детали будут очищены.';
 $lang['sales_cash'] = 'наличные деньги';
@@ -62,7 +62,6 @@ $lang['sales_successfully_deleted'] = 'продажи успешно удале
 $lang['sales_unsuccessfully_deleted'] = 'продажи безуспешно удален';
 $lang['sales_delete_entire_sale'] = 'Удалить всего продажи';
 $lang['sales_delete_confirmation'] = 'Вы уверены, что хотите удалить эту продажу, это действие не может быть отменено';
-$lang['sales_date'] = 'число продажи';
 $lang['sales_delete_successful'] = 'Вы успешно удален продаже';
 $lang['sales_delete_unsuccessful'] = 'Вы безуспешно удален продаже';
 $lang['sales_suspend_sale'] = 'Приостановить продажи';
@@ -70,10 +69,14 @@ $lang['sales_confirm_suspend_sale'] = 'Вы уверены, что хотите
 $lang['sales_suspended_sales'] = 'приостановила продажи';
 $lang['sales_suspended_sale_id'] = 'приостановила продажи ID';
 $lang['sales_date'] = 'Число';
-$lang['sales_customer'] = 'Клиент';
 $lang['sales_comments'] = 'Комментарии';
 $lang['sales_unsuspend_and_delete'] = 'Разблокировать и удалить';
 $lang['sales_unsuspend'] = 'Разблокировать';
 $lang['sales_successfully_suspended_sale'] = 'Ваши продажи успешно приостановлена';
 $lang['sales_email_receipt'] = 'послать квитанция по E-Mail';
+$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/ru/suppliers_lang.php b/application/language/ru/suppliers_lang.php
new file mode 100644
index 000000000..1478ff440
--- /dev/null
+++ b/application/language/ru/suppliers_lang.php
@@ -0,0 +1,17 @@
+<?php
+$lang['suppliers_new'] = 'Новый поставщик';
+$lang['suppliers_supplier'] = 'поставщик';
+$lang['suppliers_update'] = 'Обновить поставщика';
+$lang['suppliers_confirm_delete'] = 'Вы уверены, что хотите удалить выбранных поставщиков?';
+$lang['suppliers_none_selected'] = 'Вы не выбрали ни поставщики удалить';
+$lang['suppliers_error_adding_updating'] = 'Ошибка при добавлении/обновлении поставщиком';
+$lang['suppliers_successful_adding'] = 'Вы успешно добавили поставщиком';
+$lang['suppliers_successful_updating'] = 'Вы успешно обновляли поставщиком';
+$lang['suppliers_successful_deleted'] = 'Вы успешно удален';
+$lang['suppliers_one_or_multiple'] = 'поставщик (а)';
+$lang['suppliers_cannot_be_deleted'] = 'Не удалось удалить выбранные поставщиков, один или более из выбранных поставщиков имеет продаж.';
+$lang['suppliers_basic_information'] = 'Информация о поставщике';
+$lang['suppliers_account_number'] = '№ счета';
+$lang['suppliers_company_name'] = 'Название компании';
+$lang['suppliers_company_name_required'] = 'Название компании является обязательным полем';
+?>
\ No newline at end of file
diff --git a/application/language/zh/common_lang.php b/application/language/zh/common_lang.php
new file mode 100755
index 000000000..34e5a307e
--- /dev/null
+++ b/application/language/zh/common_lang.php
@@ -0,0 +1,41 @@
+<?php
+$lang['common_common'] = '一般';
+$lang['common_submit'] = '送出';
+$lang['common_or'] = '或';
+$lang['common_powered_by'] = 'Powered by';
+$lang['common_welcome'] = '歡迎';
+$lang['common_logout'] = '登出';
+$lang['common_list_of'] = '列表';
+$lang['common_first_name'] = '名';
+$lang['common_last_name'] = '姓';
+$lang['common_email'] = 'E-Mail';
+$lang['common_phone_number'] = '電話';
+$lang['common_address_1'] = '地址 1';
+$lang['common_address_2'] = '地址 2';
+$lang['common_city'] = '城市';
+$lang['common_state'] = '州';
+$lang['common_zip'] = '郵遞區號';
+$lang['common_country'] = '國家';
+$lang['common_comments'] = '評論';
+$lang['common_edit'] = '編輯';
+$lang['common_search'] = '搜尋';
+$lang['common_delete'] = '刪除';
+$lang['common_remove'] = '移除';
+$lang['common_view_recent_sales'] = '最新的消售資訊';
+$lang['common_you_are_using_ospos'] = '您正在使用 Open Source Point of Sale 版本';
+$lang['common_please_visit_my'] = '請造訪';
+$lang['common_website'] = '網站';
+$lang['common_fields_required_message'] = '紅色欄位為必填';
+$lang['common_learn_about_project'] = '了解系統開展進度';
+$lang['common_searched_for'] = '查找';
+$lang['common_first_name_required'] = '名為必填';
+$lang['common_last_name_required'] = '姓氏為必填';
+$lang['common_email_invalid_format'] = 'E-mail格式錯誤';
+$lang['common_confirm_search'] = '您已經選擇一行或多行，在搜索後這些紀錄將不能再被選取。您確定要提交這個搜索？';
+$lang['common_no_persons_to_display'] = '沒有使用者資料可以顯示';
+$lang['common_return_policy'] = '退貨政策';
+$lang['common_price'] = '價值';
+$lang['common_welcome_message']= '歡迎使用Open Source Point of Sale，請點擊下面的模組以開始使用！';
+$lang['common_inv'] = '庫存';
+$lang['common_det'] = '更多';
+?>
\ No newline at end of file
diff --git a/application/language/zh/config_lang.php b/application/language/zh/config_lang.php
new file mode 100755
index 000000000..27a90d9a8
--- /dev/null
+++ b/application/language/zh/config_lang.php
@@ -0,0 +1,36 @@
+<?php
+$lang['config_info'] = '儲存組態';
+$lang['config_company'] = '公司名稱';
+$lang['config_address'] = '公司地址';
+$lang['config_phone'] = '電話';
+$lang['config_website'] = '網站';
+$lang['config_fax'] = '傳真';
+$lang['config_default_tax_rate'] = '預設稅率 %';
+$lang['config_default_tax_rate_1'] = '稅率 1';
+$lang['config_default_tax_rate_2'] = '稅率 2';
+$lang['config_company_required'] = '公司名稱為必填';
+$lang['config_address_required'] = '公司地址為必填';
+$lang['config_phone_required'] = '公司電話為必填';
+$lang['config_default_tax_rate_required'] = '預設稅率為必填';
+$lang['config_default_tax_rate_number'] = '預設稅率必需為數字';
+$lang['config_company_website_url'] = '公司網址格式錯誤 (http://...)';
+$lang['config_saved_successfully'] = '組態設置儲存成功';
+$lang['config_saved_unsuccessfully'] = '組態設置儲存失敗';
+$lang['config_return_policy_required'] = '退換貨政策為必填';
+$lang['config_print_after_sale'] = '出貨時打印收據';
+$lang['config_language'] = '語言';
+$lang['config_timezone'] = '時區';
+$lang['config_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/zh/customers_lang.php b/application/language/zh/customers_lang.php
new file mode 100755
index 000000000..738672b8e
--- /dev/null
+++ b/application/language/zh/customers_lang.php
@@ -0,0 +1,16 @@
+<?php
+$lang['customers_new'] = '新客戶';
+$lang['customers_customer'] = '客戶';
+$lang['customers_update'] = '更新客戶';
+$lang['customers_confirm_delete'] = '你確定要刪除選定的客戶？';
+$lang['customers_none_selected'] = '您還沒有選擇任何客戶進行刪除';
+$lang['customers_error_adding_updating'] = '添加/更新客戶錯誤';
+$lang['customers_successful_adding'] = '成功新增顧客';
+$lang['customers_successful_updating'] = '成功更新顧客';
+$lang['customers_successful_deleted'] = '成功刪除';
+$lang['customers_one_or_multiple'] = '客戶';
+$lang['customers_cannot_be_deleted'] = '無法刪除選定的客戶，選定的客戶存有銷售紀錄。';
+$lang['customers_basic_information'] = '客戶資訊';
+$lang['customers_account_number'] = '帳號 #';
+$lang['customers_taxable'] = '應課稅';
+?>
diff --git a/application/language/zh/employees_lang.php b/application/language/zh/employees_lang.php
new file mode 100755
index 000000000..bdce1d9d9
--- /dev/null
+++ b/application/language/zh/employees_lang.php
@@ -0,0 +1,27 @@
+<?php
+$lang['employees_employee'] = '員工';
+$lang['employees_new'] = '新員工';
+$lang['employees_update'] = '更新員工';
+$lang['employees_confirm_delete'] = '你確定要刪除所選的員工嗎？';
+$lang['employees_none_selected'] = '您還沒有選擇任何員工進行刪除';
+$lang['employees_error_adding_updating'] = '添加/更新員工錯誤';
+$lang['employees_successful_adding'] = '新增員工資料成功';
+$lang['employees_successful_updating'] = '成功更新員工資料';
+$lang['employees_successful_deleted'] = '成功刪除員工資料';
+$lang['employees_one_or_multiple'] = '員工';
+$lang['employees_cannot_be_deleted'] = '無法刪除選定的僱員，選定的員工中已有銷售紀錄或你正在試圖刪除自己 :)';
+$lang['employees_username'] = '帳號';
+$lang['employees_password'] = '密碼';
+$lang['employees_repeat_password'] = '確認密碼';
+$lang['employees_username_required'] = '帳號為必填';
+$lang['employees_username_minlength'] = '帳號必需為五個字元以上';
+$lang['employees_password_required'] = '請輸入密碼';
+$lang['employees_password_minlength'] = '密碼需為八個字元以上';
+$lang['employees_password_must_match'] = '密碼與確認密碼不一致';
+$lang['employees_basic_information'] = '員工基本資料';
+$lang['employees_login_info'] = '員工登錄資料';
+$lang['employees_permission_info'] = '員工權限';
+$lang['employees_permission_desc'] = '勾選後授予使用該模組功能';
+$lang['employees_error_updating_demo_admin'] = '您不能更改admin用戶';
+$lang['employees_error_deleting_demo_admin'] = '您不能刪除admin用戶';
+?>
diff --git a/application/language/zh/error_lang.php b/application/language/zh/error_lang.php
new file mode 100755
index 000000000..d76faec43
--- /dev/null
+++ b/application/language/zh/error_lang.php
@@ -0,0 +1,4 @@
+<?php
+$lang['error_no_permission_module'] = '您沒有權限使用模組：';
+$lang['error_unknown'] = '未知';
+?>
\ No newline at end of file
diff --git a/application/language/zh/form_validation_lang.php b/application/language/zh/form_validation_lang.php
new file mode 100644
index 000000000..3418f29ab
--- /dev/null
+++ b/application/language/zh/form_validation_lang.php
@@ -0,0 +1,29 @@
+<?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/application/language/zh/giftcards_lang.php b/application/language/zh/giftcards_lang.php
new file mode 100755
index 000000000..2aaed69bc
--- /dev/null
+++ b/application/language/zh/giftcards_lang.php
@@ -0,0 +1,69 @@
+<?php
+$lang['giftcards_giftcard_number'] = '禮金券編號';
+$lang['giftcards_card_value'] = '金額';
+$lang['giftcards_basic_information'] = '禮金券資訊';
+$lang['giftcards_number_required'] = '請輸入禮金券編號';
+$lang['giftcards_value_required'] = '請輸入禮金券金額';
+$lang['giftcards_number'] = '禮金券編號需為數字';
+$lang['giftcards_value'] = '禮金券金額需為數字';
+$lang['giftcards_person_id'] = 'Customer';
+$lang['giftcards_retrive_giftcard_info'] = '檢索禮金券訊息';
+$lang['giftcards_description'] = '描述';
+$lang['giftcards_amazon'] = 'Amazon';
+$lang['giftcards_upc_database'] = 'UPC Database';
+$lang['giftcards_cannot_find_giftcard'] = '找不到禮金券的訊息';
+$lang['giftcards_info_provided_by'] = '提供信息的來源';
+$lang['giftcards_number_information'] = '禮金券編號';
+$lang['giftcards_new'] = '新建禮金券';
+$lang['giftcards_update'] = '更新禮金券';
+$lang['giftcards_giftcard'] = '禮金券';
+$lang['giftcards_edit_multiple_giftcards'] = '多重編輯';
+$lang['giftcards_category'] = '類別';
+$lang['giftcards_cost_price'] = '成本價格';
+$lang['giftcards_unit_price'] = '單位價格';
+$lang['giftcards_tax_1'] = '稅額 1';
+$lang['giftcards_tax_2'] = '稅額 2';
+$lang['giftcards_sales_tax_1'] = '銷售稅額 1';
+$lang['giftcards_sales_tax_2'] = '銷售稅額 2';
+$lang['giftcards_tax_percent'] = '稅率';
+$lang['giftcards_tax_percents'] = '稅率 Percent(s)';
+$lang['giftcards_reorder_level'] = '補貨點';
+$lang['giftcards_quantity'] = '數量';
+$lang['giftcards_no_giftcards_to_display'] = '沒有禮金券可以顯示';
+$lang['giftcards_bulk_edit'] = '批量編輯';
+$lang['giftcards_confirm_delete'] = '你確定你要刪除選定的禮金券?';
+$lang['giftcards_none_selected'] = '您還沒有選擇任何禮金券進行編輯';
+$lang['giftcards_confirm_bulk_edit'] = '您確定您要編輯的所有選擇的禮金券嗎？';
+$lang['giftcards_successful_bulk_edit'] = '您已成功更新選定的禮品卡';
+$lang['giftcards_error_updating_multiple'] = '禮金券更新錯誤';
+$lang['giftcards_edit_fields_you_want_to_update'] = '編輯所有選定的禮金券中你想要編輯的資料';
+$lang['giftcards_error_adding_updating'] = '新增/更新禮金券錯誤';
+$lang['giftcards_successful_adding'] = '新增禮金券成功';
+$lang['giftcards_successful_updating'] = '成功更新禮金券';
+$lang['giftcards_successful_deleted'] = '成功刪除禮金券';
+$lang['giftcards_one_or_multiple'] = '禮金券';
+$lang['giftcards_cannot_be_deleted'] = '無法刪除選定的禮金券，一個或多個所選擇的禮金券已經使用。';
+$lang['giftcards_none'] = '無';
+$lang['giftcards_supplier'] = '供應商';
+$lang['giftcards_generate_barcodes'] = '產生條碼';
+$lang['giftcards_must_select_giftcard_for_barcode'] = '您必須選擇至少一個禮金券才能生成條形碼';
+$lang['giftcards_excel_import_failed'] = 'Excel匯入失敗';
+$lang['giftcards_allow_alt_description'] = '允許使用ALT描述';
+$lang['giftcards_is_serialized'] = '禮金券序號';
+$lang['giftcards_low_inventory_giftcards'] = '禮金券庫存過低';
+$lang['giftcards_serialized_giftcards'] = '排序禮金券';
+$lang['giftcards_no_description_giftcards'] = '沒有描述的禮金券';
+$lang['giftcards_inventory_comments'] = '評論';
+$lang['giftcards_count'] = '更新庫存';
+$lang['giftcards_details_count'] = '庫存盤點詳情';
+$lang['giftcards_add_minus'] = '加/減庫存';
+$lang['giftcards_current_quantity'] = '當前數量';
+$lang['giftcards_quantity_required'] = '數量是必填字段。請按關閉（X）來取消';
+$lang['giftcards_do_nothing'] = '不做任何修改';
+$lang['giftcards_change_all_to_serialized'] = '全部更改序號至序列化';
+$lang['giftcards_change_all_to_unserialized'] = '全部更改序號至非序列化';
+$lang['giftcards_change_all_to_allow_alt_desc'] = '充許全部ALT倒序';
+$lang['giftcards_change_all_to_not_allow_allow_desc'] = '不允許全部ALT倒序';
+$lang['giftcards_use_inventory_menu'] = '使用庫存清單';
+$lang['giftcards_manually_editing_of_quantity'] = '手動編輯數量';
+?>
\ No newline at end of file
diff --git a/application/language/zh/index.html b/application/language/zh/index.html
new file mode 100755
index 000000000..0696be4eb
--- /dev/null
+++ b/application/language/zh/index.html
@@ -0,0 +1,10 @@
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/application/language/zh/item_kits_lang.php b/application/language/zh/item_kits_lang.php
new file mode 100755
index 000000000..44cb53bfb
--- /dev/null
+++ b/application/language/zh/item_kits_lang.php
@@ -0,0 +1,20 @@
+<?php
+$lang['item_kits_name'] = '產品套件';
+$lang['item_kits_description'] = '產品套件描述';
+$lang['item_kits_no_item_kits_to_display'] = '沒有產品套件';
+$lang['item_kits_update'] = '更新產品套件';
+$lang['item_kits_new'] = '新增產品套件';
+$lang['item_kits_none_selected'] = "沒有選擇任何產品套件";
+$lang['item_kits_info'] = '產品套件資料';
+$lang['item_kits_successful_adding'] = '新增產品套件成功';
+$lang['item_kits_successful_updating'] = '更新產品套件成功';
+$lang['item_kits_error_adding_updating'] = '新增/更新產品套件錯誤';
+$lang['item_kits_successful_deleted'] = '刪除成功';
+$lang['item_kits_confirm_delete'] = '你確定你要刪除選取的產品套件嗎？';
+$lang['item_kits_one_or_multiple'] = '產品套件';
+$lang['item_kits_cannot_be_deleted'] = '無法刪除產品套件';
+$lang['item_kits_add_item'] = '新增套件';
+$lang['item_kits_items'] = '產品';
+$lang['item_kits_item'] = '產品';
+$lang['item_kits_quantity'] = '數量';
+?>
diff --git a/application/language/zh/items_lang.php b/application/language/zh/items_lang.php
new file mode 100755
index 000000000..0c4c27202
--- /dev/null
+++ b/application/language/zh/items_lang.php
@@ -0,0 +1,81 @@
+<?php
+$lang['items_item_number'] = 'UPC/EAN/ISBN';
+$lang['items_retrive_item_info'] = '檢索產品訊息';
+$lang['items_description'] = '描述';
+$lang['items_amazon'] = 'Amazon';
+$lang['items_upc_database'] = 'UPC Database';
+$lang['items_cannot_find_item'] = '無法找到任何有關的產品';
+$lang['items_info_provided_by'] = '訊息提供者';
+$lang['items_basic_information'] = '產品訊息';
+$lang['items_number_information'] = '產品編號';
+$lang['items_new'] = '新增產品';
+$lang['items_update'] = '更新產品';
+$lang['items_item'] = '產品';
+$lang['items_edit_multiple_items'] = '編輯多項產品';
+$lang['items_name'] = '產品名稱';
+$lang['items_category'] = '類別';
+$lang['items_cost_price'] = '成本價';
+$lang['items_unit_price'] = '單價';
+$lang['items_tax_1'] = '稅額 1';
+$lang['items_tax_2'] = '稅額 2';
+$lang['items_sales_tax_1'] = '營業稅';
+$lang['items_sales_tax_2'] = '營業稅 2';
+$lang['items_tax_percent'] = '稅率';
+$lang['items_tax_percents'] = '稅率 %';
+$lang['items_reorder_level'] = '補貨點';
+$lang['items_quantity'] = '數量';
+$lang['items_reorder_level'] = '補貨點';
+$lang['items_no_items_to_display'] = '沒有產品可以顯示';
+$lang['items_bulk_edit'] = '批次編輯';
+$lang['items_confirm_delete'] = '你確定你要刪除選定的產品嗎？';
+$lang['items_none_selected'] = '您還沒有選擇任何產品進行編輯';
+$lang['items_confirm_bulk_edit'] = '您確定您要編輯的所有選定的產品嗎？';
+$lang['items_successful_bulk_edit'] = '您已成功更新所選產品';
+$lang['items_error_updating_multiple'] = '更新產品錯誤';
+$lang['items_edit_fields_you_want_to_update'] = '編輯您選定產品的所有欄位';
+$lang['items_error_adding_updating'] = '新增/更新產品錯誤';
+$lang['items_successful_adding'] = '已成功新增產品';
+$lang['items_successful_updating'] = '已成功更新產品';
+$lang['items_successful_deleted'] = '刪除成功';
+$lang['items_one_or_multiple'] = '產品';
+$lang['items_cannot_be_deleted'] = '無法刪除選定產品，所選產品中的一個或多個有銷售紀綠。';
+$lang['items_name_required'] = '產品名稱為必填';
+$lang['items_category_required'] = '類別為必填欄位';
+$lang['items_buy_price_required'] = '進貨價為必填欄位';
+$lang['items_unit_price_required'] = '單價為必填欄位';
+$lang['items_cost_price_required'] = '成本價為必填攔位';
+$lang['items_tax_percent_required'] = '稅率為必填欄位';
+$lang['items_quantity_required'] = '數量為必填欄位';
+$lang['items_reorder_level_required'] = '補貨點為必填欄位';
+$lang['items_unit_price_number'] = '單價必需是數值';
+$lang['items_cost_price_number'] = '成本價必需是數值';
+$lang['items_quantity_number'] = '數量必需是數值';
+$lang['items_reorder_level_number'] = '補貨點必需是數值';
+$lang['items_none'] = '無';
+$lang['items_supplier'] = '供貨商';
+$lang['items_generate_barcodes'] = '產生條碼';
+$lang['items_must_select_item_for_barcode'] = '您必須至少選擇一個產品生才能產生條碼';
+$lang['items_excel_import_failed'] = 'Excel匯入失敗';
+$lang['items_allow_alt_description'] = '允許ALT描述';
+$lang['items_is_serialized'] = '產品有序號';
+$lang['items_low_inventory_items'] = '低庫存產品';
+$lang['items_serialized_items'] = '序列化產品';
+$lang['items_no_description_items'] = '產品沒有說明';
+$lang['items_search_custom_items'] = 'Search Custom Fields';//GARRISON ADDED
+$lang['items_inventory_comments'] = '評論';
+$lang['items_count'] = '更新庫存';
+$lang['items_details_count'] = '庫存盤點詳情';
+$lang['items_add_minus'] = '增/減庫存';
+$lang['items_current_quantity'] = '當前數量';
+$lang['items_quantity_required'] = '數量是必填欄位。請關閉（X）來取消';
+$lang['items_do_nothing'] = '沒有執行任何修改';
+$lang['items_change_all_to_serialized'] = '全部更改序號至序列化';
+$lang['items_change_all_to_unserialized'] = '全部更改序號至非序列化';
+$lang['items_change_all_to_allow_alt_desc'] = ' 充許全部ALT倒序';
+$lang['items_change_all_to_not_allow_allow_desc'] = '不允許全部ALT倒序';
+$lang['items_use_inventory_menu'] = '使用庫存清單';
+$lang['items_manually_editing_of_quantity'] = '手動編輯數量';
+$lang['items_inventory'] = '庫存';
+$lang['items_location'] = '位置';
+$lang['items_is_deleted'] = 'Deleted';// Parq 131215
+?>
\ No newline at end of file
diff --git a/application/language/zh/login_lang.php b/application/language/zh/login_lang.php
new file mode 100755
index 000000000..3b0e4c1f1
--- /dev/null
+++ b/application/language/zh/login_lang.php
@@ -0,0 +1,8 @@
+<?php
+$lang['login_login'] = '登入';
+$lang['login_username'] = '帳號';
+$lang['login_password'] = '密碼';
+$lang['login_go'] = '登入';
+$lang['login_invalid_username_and_password'] = '錯誤的帳號或密碼';
+$lang['login_welcome_message'] = '歡迎使用Master6進銷存。若要繼續，請使用您的帳號和密碼登錄。';
+?>
diff --git a/application/language/zh/module_lang.php b/application/language/zh/module_lang.php
new file mode 100755
index 000000000..a3dbc7f27
--- /dev/null
+++ b/application/language/zh/module_lang.php
@@ -0,0 +1,34 @@
+<?php
+$lang['module_home'] = '首頁';
+
+$lang['module_customers'] = '客戶';
+$lang['module_customers_desc'] = '添加，更新，刪除，搜索客戶';
+
+$lang['module_suppliers'] = '供應商';
+$lang['module_suppliers_desc'] = '添加，更新，刪除，搜索供應商';
+
+$lang['module_employees'] = '員工';
+$lang['module_employees_desc'] = '添加，更新，刪除，搜索員工';
+
+$lang['module_sales'] = '出貨';
+$lang['module_sales_desc'] = '出貨與退貨';
+
+$lang['module_reports'] = '報表';
+$lang['module_reports_desc'] = '檢視與產生報表';
+
+$lang['module_items'] = '產品';
+$lang['module_items_desc'] = '添加，更新，刪除，搜索產品';
+
+$lang['module_config'] = '系統配置';
+$lang['module_config_desc'] = '修改系統配置';
+
+$lang['module_receivings'] = '進貨';
+$lang['module_receivings_desc'] = '採購訂單流程';
+
+$lang['module_giftcards'] = '禮金券';
+$lang['module_giftcards_desc'] = '添加，更新，刪除，搜索禮金券';
+
+$lang['module_item_kits'] = '產品套件';
+$lang['module_item_kits_desc'] = '添加，更新，刪除，搜索產品套件';
+
+?>
diff --git a/application/language/zh/receivings_lang.php b/application/language/zh/receivings_lang.php
new file mode 100755
index 000000000..89f5c56c5
--- /dev/null
+++ b/application/language/zh/receivings_lang.php
@@ -0,0 +1,26 @@
+<?php
+$lang['recvs_register'] = '產品進貨';
+$lang['recvs_mode'] = '進貨模式';
+$lang['recvs_receiving'] = '收貨';
+$lang['recvs_return'] = '退貨';
+$lang['recvs_total'] = '總數量';
+$lang['recvs_cost'] = '成本';
+$lang['recvs_quantity'] = '數量.';
+$lang['recvs_discount'] = '折古 %';
+$lang['recvs_edit'] = '編輯';
+$lang['recvs_new_supplier'] = '新供應商';
+$lang['recvs_supplier'] = '供應商';
+$lang['recvs_select_supplier'] = '選擇供應商 (Optional)';
+$lang['recvs_start_typing_supplier_name'] = '開始輸入供應商名稱...';
+$lang['recvs_unable_to_add_item'] = '無法新增進貨資料';
+$lang['recvs_error_editing_item'] = '產品編輯錯誤';
+$lang['recvs_receipt'] = '收貨憑證';
+$lang['recvs_complete_receiving'] = '完成';
+$lang['recvs_confirm_finish_receiving'] = '您確定要提交此進貨資料嗎？一旦送出將不能撤消。';
+$lang['recvs_confirm_cancel_receiving'] = '您確定要刪除此進貨資料嗎？本資料中所有的產品資料也將會被清空。';
+$lang['recvs_find_or_scan_item'] = '查找 / 掃描產品';
+$lang['recvs_find_or_scan_item_or_receipt'] = '查找 / 掃描產品或收據';
+$lang['recvs_id'] = '進貨編號';
+$lang['recvs_item_name'] = '產品名稱';
+$lang['receivings_transaction_failed'] = '進貨交易失敗';
+?>
diff --git a/application/language/zh/reports_lang.php b/application/language/zh/reports_lang.php
new file mode 100755
index 000000000..7b1b1501c
--- /dev/null
+++ b/application/language/zh/reports_lang.php
@@ -0,0 +1,88 @@
+<?php
+$lang['reports_reports'] = '報表';
+$lang['reports_report'] = '報表';
+$lang['reports_welcome_message'] = '歡迎使用報表系統。請選擇要查看的報表。';
+$lang['reports_sales_summary_report'] = '銷售摘要報告';
+$lang['reports_categories_summary_report'] = '分類摘要報告';
+$lang['reports_customers_summary_report'] = '客戶摘要報告';
+$lang['reports_suppliers_summary_report'] = '供應商摘要報告';
+$lang['reports_items_summary_report'] = '產品摘要報告';
+$lang['reports_employees_summary_report'] = '員工摘要報告';
+$lang['reports_taxes_summary_report'] = '稅金摘要報告';
+$lang['reports_date'] = '日期';
+$lang['reports_name'] = '名稱';
+$lang['reports_quantity_purchased'] = '銷售金額';
+$lang['reports_sale_id'] = '銷售編號';
+$lang['reports_items_purchased'] = '銷售產品';
+$lang['reports_sold_by'] = '銷售人';
+$lang['reports_sold_to'] = '購買人';
+$lang['reports_category'] = '類別';
+$lang['reports_customer'] = '客戶';
+$lang['reports_employee'] = '員工';
+$lang['reports_item'] = '產品';
+$lang['reports_items'] = '產品';
+$lang['reports_supplier'] = '供應商';
+$lang['reports_employees'] = '員工';
+$lang['reports_subtotal'] = '小計';
+$lang['reports_total'] = '總計';
+$lang['reports_tax'] = '稅額';
+$lang['reports_profit'] = '利潤';
+$lang['reports_report_input'] = '輸入報表';
+$lang['reports_type'] = '類型';
+$lang['reports_date_range'] = '日期範圍';
+$lang['reports_today'] = '今天';
+$lang['reports_yesterday'] = '昨天';
+$lang['reports_last_7'] = '過去七天';
+$lang['reports_this_month'] = '這個月';
+$lang['reports_last_month'] = '上個月';
+$lang['reports_this_year'] = '今年';
+$lang['reports_last_year'] = '去年';
+$lang['reports_all_time'] = '全部';
+$lang['reports_detailed_sales_report'] = '詳細銷售報表';
+$lang['reports_comments'] = '評論';
+$lang['reports_discount'] = '折扣';
+$lang['reports_payment_type'] = '付款方式';
+$lang['reports_sales'] = '銷售';
+$lang['reports_categories'] = '類別';
+$lang['reports_customers'] = '客戶';
+$lang['reports_suppliers'] = '供應商';
+$lang['reports_items'] = '產品';
+$lang['reports_employees'] = '員工';
+$lang['reports_taxes'] = '稅額';
+$lang['reports_customer'] = '客戶';
+$lang['reports_employee'] = '員工';
+$lang['reports_tax_percent'] = '稅率';
+$lang['reports_quantity_purchased'] = '購買數量';
+$lang['reports_serial_number'] = '序號 #';
+$lang['reports_description'] = '描述';
+$lang['reports_date'] = '日期';
+$lang['reports_sales_amount'] = '總銷售額';
+$lang['reports_revenue'] = '收入';
+$lang['reports_discounts'] = '折扣';
+$lang['reports_discounts_summary_report'] = '折扣摘要報告';
+$lang['reports_discount_percent'] = '折扣率';
+$lang['reports_count'] = '計';
+$lang['reports_summary_reports'] = '摘要報表';
+$lang['reports_graphical_reports'] = '圖表';
+$lang['reports_detailed_reports'] = '詳細報表';
+$lang['reports_inventory_reports'] = '庫存報告';
+$lang['reports_low_inventory'] = '低庫存';
+$lang['reports_inventory_summary'] = ' 庫存摘要';
+$lang['reports_item_number'] = '產品數量';
+$lang['reports_reorder_level'] = '補貨點';
+$lang['reports_low_inventory_report'] = '低庫存報告';
+$lang['reports_item_name'] = '產品名稱';
+$lang['reports_inventory_summary_report'] = '庫存報告摘要';
+$lang['reports_payment_type'] = '付款模式';
+$lang['reports_payments_summary_report'] = '收入報告摘要';
+$lang['reports_payments'] = '付款';
+$lang['reports_receivings'] = '應付款';
+$lang['reports_received_by'] = '收款人';
+$lang['reports_supplied_by'] = '付款人';
+$lang['reports_items_received'] = '進貨產品';
+$lang['reports_detailed_receivings_report'] = '詳細的進貨報告';
+$lang['reports_sale_type'] = '銷售類型';
+$lang['reports_all'] = '全部';
+$lang['reports_returns'] = '返回';
+$lang['reports_discount'] = 'A discount greater than ';
+?>
\ No newline at end of file
diff --git a/application/language/zh/sales_lang.php b/application/language/zh/sales_lang.php
new file mode 100755
index 000000000..64df4ab0e
--- /dev/null
+++ b/application/language/zh/sales_lang.php
@@ -0,0 +1,82 @@
+<?php
+$lang['sales_giftcard_number'] = '禮金券編號';
+$lang['sales_giftcard'] = '禮金券';
+$lang['sales_register'] = '銷售登記';
+$lang['sales_mode'] = '登記模式';
+$lang['sales_new_item'] = '新增產品';
+$lang['sales_item_name'] = '產品名稱';
+$lang['sales_item_number'] = '產品 #';
+$lang['sales_new_customer'] = '新客戶';
+$lang['sales_customer'] = '客戶';
+$lang['sales_no_items_in_cart'] = '購物車中沒有任何產品';
+$lang['sales_total'] = '總計';
+$lang['sales_tax_percent'] = '稅率 %';
+$lang['sales_price'] = '價格';
+$lang['sales_quantity'] = '數量.';
+$lang['sales_discount'] = '折扣 %';
+$lang['sales_edit'] = '編輯';
+$lang['sales_payment'] = '付款方式';
+$lang['sales_edit_item'] = '編輯產品';
+$lang['sales_find_or_scan_item'] = '查找/掃描商品';
+$lang['sales_find_or_scan_item_or_receipt'] = '查找/掃描產品或收貨單';
+$lang['sales_select_customer'] = '選擇客戶 (Optional)';
+$lang['sales_start_typing_item_name'] = '開始輸入產品名或掃描條碼...';
+$lang['sales_start_typing_customer_name'] = '開始輸入客戶的名字';
+$lang['sales_sub_total'] = '小計';
+$lang['sales_tax'] = '稅額';
+$lang['sales_comment'] = '評論';
+$lang['sales_unable_to_add_item'] = '無法增加出售產品';
+$lang['sales_sale_for_customer'] = '客戶:';
+$lang['sales_remove_customer'] = '移除客戶';
+$lang['sales_error_editing_item'] = '編輯產品錯誤';
+$lang['sales_complete_sale'] = '完成銷售';
+$lang['sales_cancel_sale'] = '取消銷售';
+$lang['sales_add_payment'] = '新增付款';
+$lang['sales_receipt'] = '銷貨單';
+$lang['sales_id'] = '銷售編號';
+$lang['sales_sale'] = '銷售';
+$lang['sales_return'] = '退貨';
+$lang['sales_confirm_finish_sale'] = '你確定要提交銷售單？此動作不能撤消。';
+$lang['sales_confirm_cancel_sale'] = '你確定要清除此筆銷售單？本單內的所有產品將被清除。';
+$lang['sales_cash'] = '現金';
+$lang['sales_check'] = '支票';
+$lang['sales_debit'] = '簽帳卡';
+$lang['sales_credit'] = '信用卡';
+$lang['sales_giftcard'] = '禮金券';
+$lang['sales_amount_tendered'] = '已收帳款';
+$lang['sales_change_due'] = '更改到期日';
+$lang['sales_payment_not_cover_total'] = '付款金額不足';
+$lang['sales_transaction_failed'] = '銷售交易失敗';
+$lang['sales_must_enter_numeric'] = '已收帳款必須輸入數值';
+$lang['sales_must_enter_numeric_giftcard'] = '禮金券編號必須輸入數值';
+$lang['sales_serial'] = '序號';
+$lang['sales_description_abbrv'] = '倒序';
+$lang['sales_item_out_of_stock'] = '產品缺貨';
+$lang['sales_item_insufficient_of_stock'] = '產品庫存不足';
+$lang['sales_quantity_less_than_zero'] = '警告！產品的庫存數量是不足的。您仍然可以處理銷售，但檢查您的庫存';
+$lang['sales_successfully_updated'] = '銷售資料成功更新';
+$lang['sales_unsuccessfully_updated'] = '銷售資料更新失敗';
+$lang['sales_edit_sale'] = '編輯銷售資料';
+$lang['sales_employee'] = '員工';
+$lang['sales_successfully_deleted'] = '銷售資料成功刪除';
+$lang['sales_unsuccessfully_deleted'] = '銷售資料刪除失敗';
+$lang['sales_delete_entire_sale'] = '刪除全部銷售資料';
+$lang['sales_delete_confirmation'] = '你確定要刪除此銷售資料，這個動作不能撤消';
+$lang['sales_delete_successful'] = '您已成功刪除銷售資料';
+$lang['sales_delete_unsuccessful'] = '銷售資料刪除失敗';
+$lang['sales_suspend_sale'] = '暫停銷售';
+$lang['sales_confirm_suspend_sale'] = '你確定要暫停銷售？';
+$lang['sales_suspended_sales'] = '已暫停銷售';
+$lang['sales_suspended_sale_id'] = '暫停銷售編號';
+$lang['sales_date'] = '日期';
+$lang['sales_comments'] = '評論';
+$lang['sales_unsuspend_and_delete'] = '取消暫停銷售並刪除';
+$lang['sales_unsuspend'] = '取消暫停銷售';
+$lang['sales_successfully_suspended_sale'] = '本銷售資料已經成功暫停';
+$lang['sales_email_receipt'] = 'E-Mail 銷售單';
+$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/zh/suppliers_lang.php b/application/language/zh/suppliers_lang.php
new file mode 100755
index 000000000..986d608de
--- /dev/null
+++ b/application/language/zh/suppliers_lang.php
@@ -0,0 +1,17 @@
+<?php
+$lang['suppliers_new'] = '新增供應商';
+$lang['suppliers_supplier'] = '供應商';
+$lang['suppliers_update'] = '更新供應商';
+$lang['suppliers_confirm_delete'] = '你確定要刪除選定的供應商嗎？';
+$lang['suppliers_none_selected'] = '您還沒有選擇任何供應商進行刪除';
+$lang['suppliers_error_adding_updating'] = '新增/更新供應商錯誤';
+$lang['suppliers_successful_adding'] = '您已成功新增供應商';
+$lang['suppliers_successful_updating'] = '您已成功更新供應商';
+$lang['suppliers_successful_deleted'] = '您已成功刪除供應商';
+$lang['suppliers_one_or_multiple'] = '供應商';
+$lang['suppliers_cannot_be_deleted'] = '無法刪除所選擇的供應商，選定的供應商中至少有一家已有銷售紀錄。';
+$lang['suppliers_basic_information'] = '供應商資料';
+$lang['suppliers_account_number'] = '帳號 #';
+$lang['suppliers_company_name'] = '公司名稱';
+$lang['suppliers_company_name_required'] = '公司名稱是必填欄位';
+?>
\ No newline at end of file
diff --git a/application/models/item.php b/application/models/item.php
index 00a5b640d..f38fd971e 100644
--- a/application/models/item.php
+++ b/application/models/item.php
@@ -33,7 +33,7 @@ class Item extends CI_Model
 		return $this->db->count_all_results();
 	}
 
-	function get_all_filtered($low_inventory=0,$is_serialized=0,$no_description,$search_custom)/**GARRISON MODIFIED 4/21/2013**/
+	function get_all_filtered($low_inventory=0,$is_serialized=0,$no_description,$search_custom,$is_deleted)/**GARRISON MODIFIED 4/21/2013, Parq 131215 **/
 	{
 		$this->db->from('items');
 		if ($low_inventory !=0 )
@@ -64,7 +64,14 @@ class Item extends CI_Model
 			$this->db->or_like('custom10',$search);
 		}
 **/		
-		$this->db->where('deleted',0);
+/* Parq 131215 start*/
+		if ($is_deleted !=0 )
+		{
+			$this->db->where('deleted',1);
+		} else {
+			$this->db->where('deleted',0);
+		}
+/* Parq 131215 end*/
 		$this->db->order_by("name", "asc");
 		return $this->db->get();
 	}
@@ -107,6 +114,7 @@ class Item extends CI_Model
 	{
 		$this->db->from('items');
 		$this->db->where('item_number',$item_number);
+		$this->db->where('deleted',0); // Parq 131226
 
 		$query = $this->db->get();
 
diff --git a/application/views/config.php b/application/views/config.php
index b8e89c204..75053ee39 100644
--- a/application/views/config.php
+++ b/application/views/config.php
@@ -143,12 +143,12 @@ echo form_open('config/save/',array('id'=>'config_form'));
 <?php echo form_label($this->lang->line('config_language').':', 'language',array('class'=>'wide required')); ?>
 	<div class='form_field'>
 	<?php echo form_dropdown('language', array(
-			'Azerbaijan'		=> 'Azerbaijan',
-			'BahasaIndonesia'	=> 'BahasaIndonesia',
-			'english'			=> 'English',
-			'dutch'				=> 'dutch',
-			'Spanish'			=> 'Spanish',
-			'Russian'			=> 'Russian'
+			'en'    => 'English',
+			'es'    => 'Spanish',
+			'ru'    => 'Russian',
+			'nl-BE'    => 'Dutch',
+			'zh'    => 'Chinese',
+                        'id'    => 'Indonesia'
 			), 
 		$this->config->item('language'));
 		?>
diff --git a/application/views/items/form.php b/application/views/items/form.php
index 1b7f452b2..5b0db5da9 100644
--- a/application/views/items/form.php
+++ b/application/views/items/form.php
@@ -160,7 +160,7 @@ echo form_open('items/save/'.$item_info->item_id,array('id'=>'item_form'));
 </div>
 
 <div class="field_row clearfix">
-<?php echo form_label($this->lang->line('items_allow_alt_desciption').':', 'allow_alt_description',array('class'=>'wide')); ?>
+<?php echo form_label($this->lang->line('items_allow_alt_description').':', 'allow_alt_description',array('class'=>'wide')); ?>
 	<div class='form_field'>
 	<?php echo form_checkbox(array(
 		'name'=>'allow_alt_description',
diff --git a/application/views/items/form_bulk.php b/application/views/items/form_bulk.php
index 5bfedc9b2..accbdfa30 100644
--- a/application/views/items/form_bulk.php
+++ b/application/views/items/form_bulk.php
@@ -131,9 +131,9 @@ echo form_open('items/bulk_update/',array('id'=>'item_form'));
 
 <div class="field_row clearfix">
 
-<?php echo form_label($this->lang->line('items_allow_alt_desciption').':', 'allow_alt_description',array('class'=>'wide')); ?>
+<?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_desciption_choices);?>
+	<?php echo form_dropdown('allow_alt_description', $allow_alt_description_choices);?>
 
 	</div>
 
diff --git a/application/views/items/manage.php b/application/views/items/manage.php
index 094c0702a..732cd1ce3 100644
--- a/application/views/items/manage.php
+++ b/application/views/items/manage.php
@@ -42,8 +42,13 @@ $(document).ready(function()
     	    	$('#items_filter_form').submit();
     	    });
     	    //END GARRISON ADDED
+    $("#is_deleted").click(function()
+    {
+    	$('#items_filter_form').submit();
+    }); // Parq 131215
 });
 
+
 function init_table_sorting()
 {
 	//Only init if there is more than one row
@@ -158,6 +163,8 @@ function show_hide_search_filter(search_filter_section, switchImgTag) {
 	<?php echo form_checkbox(array('name'=>'no_description','id'=>'no_description','value'=>1,'checked'=> isset($no_description)?  ( ($no_description)? 1 : 0) : 0)).' | ';?>
 	<?php echo form_label($this->lang->line('items_search_custom_items').' '.':', 'search_custom');//GARRISON ADDED 4/21/2013?>
 	<?php echo form_checkbox(array('name'=>'search_custom','id'=>'search_custom','value'=>1,'checked'=> isset($search_custom)?  ( ($search_custom)? 1 : 0) : 0)).' | ';//GARRISON ADDED 4/21/2013?>
+	<?php echo form_label($this->lang->line('items_is_deleted').' '.':', 'is_deleted');// Parq 131215?> 
+	<?php echo form_checkbox(array('name'=>'is_deleted','id'=>'is_deleted','value'=>1,'checked'=> isset($is_deleted)?  ( ($is_deleted)? 1 : 0) : 0)).' | ';// Parq 131215?>
 	<input type="hidden" name="search_section_state" id="search_section_state" value="<?php echo isset($search_section_state)?  ( ($search_section_state)? 'block' : 'none') : 'none';?>" />
 	</form>
 </div>
@@ -180,4 +187,4 @@ function show_hide_search_filter(search_filter_section, switchImgTag) {
 <?php echo $manage_table; ?>
 </div>
 <div id="feedback_bar"></div>
-<?php $this->load->view("partial/footer"); ?>
\ No newline at end of file
+<?php $this->load->view("partial/footer"); ?>
diff --git a/application/views/sales/register.php b/application/views/sales/register.php
index d206ede20..15ba5a50a 100644
--- a/application/views/sales/register.php
+++ b/application/views/sales/register.php
@@ -273,11 +273,11 @@ else
 
 
     <table width="100%"><tr>
-    <td style="width:55%; "><div class="float_left"><?php echo 'Payments Total:' ?></div></td>
+    <td style="width:55%; "><div class="float_left"><?php echo $this->lang->line('sales_payments_total').':';?></div></td>
     <td style="width:45%; text-align:right;"><div class="float_left" style="text-align:right;font-weight:bold;"><?php echo to_currency($payments_total); ?></div></td>
 	</tr>
 	<tr>
-	<td style="width:55%; "><div class="float_left" ><?php echo 'Amount Due:' ?></div></td>
+	<td style="width:55%; "><div class="float_left" ><?php echo $this->lang->line('sales_amount_due').':';?></div></td>
 	<td style="width:45%; text-align:right; "><div class="float_left" style="text-align:right;font-weight:bold;"><?php echo to_currency($amount_due); ?></div></td>
 	</tr></table>