From dc0f8147f51bf3b6c8b57533970b48cb795929a5 Mon Sep 17 00:00:00 2001
From: jekkos <jekkos@c3eb156b-1dc0-44e1-88ae-e38439141b53>
Date: Mon, 17 Mar 2014 21:18:17 +0000
Subject: [PATCH] Indonesian language files updated (Oktafianus) Added labels
 for receipt_number Remove merge tags from language files

git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@96 c3eb156b-1dc0-44e1-88ae-e38439141b53
---
 application/language/en/sales_lang.php      |   1 +
 application/language/es/sales_lang.php      |   4 +-
 application/language/id/common_lang.php     |  30 ++--
 application/language/id/config_lang.php     |  14 +-
 application/language/id/customers_lang.php  |   6 +-
 application/language/id/employees_lang.php  |  28 ++--
 application/language/id/giftcards_lang.php  | 130 +++++++--------
 application/language/id/item_kits_lang.php  |  36 ++---
 application/language/id/items_lang.php      |  84 +++++-----
 application/language/id/login_lang.php      |   6 +-
 application/language/id/module_lang.php     |  30 ++--
 application/language/id/receivings_lang.php |  46 +++---
 application/language/id/reports_lang.php    |  84 +++++-----
 application/language/id/sales_lang.php      | 170 ++++++++++----------
 application/language/id/suppliers_lang.php  |  20 +--
 application/language/nl-BE/sales_lang.php   |   3 -
 application/language/ru/sales_lang.php      |   4 +-
 application/language/zh/sales_lang.php      |   1 +
 18 files changed, 345 insertions(+), 352 deletions(-)

diff --git a/application/language/en/sales_lang.php b/application/language/en/sales_lang.php
index e19900992..c40d4b651 100644
--- a/application/language/en/sales_lang.php
+++ b/application/language/en/sales_lang.php
@@ -33,6 +33,7 @@ $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_receipt_number']='POS #';
 $lang['sales_id'] = 'Sale ID';
 $lang['sales_sale'] = 'Sale';
 $lang['sales_return'] = 'Return';
diff --git a/application/language/es/sales_lang.php b/application/language/es/sales_lang.php
index 1904c5566..f1fce9b96 100644
--- a/application/language/es/sales_lang.php
+++ b/application/language/es/sales_lang.php
@@ -33,6 +33,7 @@ $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_receipt_number']='POS #';
 $lang['sales_id'] = 'ID de Venta';
 $lang['sales_sale'] = 'Venta';
 $lang['sales_return'] = 'Devolución';
@@ -81,8 +82,5 @@ $lang['sales_payments_total'] = 'Pagado';
 $lang['sales_amount_due'] = 'Debe';
 $lang['sales_payment_type'] = "Tipo";
 $lang['sales_payment_amount'] = "Cantidad";
-<<<<<<< HEAD
-=======
 $lang['sales_basic_information'] = "información sobre las entradas";
->>>>>>> master
 ?>
diff --git a/application/language/id/common_lang.php b/application/language/id/common_lang.php
index bad1431db..a614a1062 100644
--- a/application/language/id/common_lang.php
+++ b/application/language/id/common_lang.php
@@ -1,12 +1,12 @@
 <?php
-$lang['common_common'] = 'biasa';
+$lang['common_common'] = 'Biasa';
 $lang['common_submit'] = 'Kirim';
 $lang['common_or'] = 'ATAU';
-$lang['common_powered_by'] = 'Disponsori oleh';
+$lang['common_powered_by'] = 'Diberdayakan oleh';
 $lang['common_welcome'] = 'Selamat Datang';
-$lang['common_logout'] = 'Logout';
+$lang['common_logout'] = 'Keluar';
 $lang['common_list_of'] = 'Daftar';
-$lang['common_first_name'] = 'Nama Pertama';
+$lang['common_first_name'] = 'Nama Depan';
 $lang['common_last_name'] = 'Nama Belakang';
 $lang['common_email'] = 'E-Mail';
 $lang['common_phone_number'] = 'Telepon';
@@ -14,28 +14,28 @@ $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_zip'] = 'Kode POS';
 $lang['common_country'] = 'Negara';
 $lang['common_comments'] = 'Catatan';
-$lang['common_edit'] = 'ubah';
+$lang['common_edit'] = 'Ubah';
 $lang['common_search'] = 'Cari';
 $lang['common_delete'] = 'Hapus';
-$lang['common_remove'] = 'Remove';
+$lang['common_remove'] = '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_please_visit_my'] = 'Silahkan kunjungi';
+$lang['common_website'] = 'Situs';
+$lang['common_fields_required_message'] = 'Bagian yang ditandai warna 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_first_name_required'] = 'Nama depan 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';
+$lang['common_welcome_message']= 'Selamat Datang, klik modul di bawah ini untuk memulai';
+$lang['common_inv'] = 'Inv';
+$lang['common_det'] = 'Detail';
 ?>
\ No newline at end of file
diff --git a/application/language/id/config_lang.php b/application/language/id/config_lang.php
index b91030b62..a0576ccfb 100644
--- a/application/language/id/config_lang.php
+++ b/application/language/id/config_lang.php
@@ -16,12 +16,12 @@ $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_return_policy_required'] = 'Kebijakan retur wajib diisi';
+$lang['config_print_after_sale'] = 'Cetak Faktur setelah penjualan';
+$lang['config_language'] = 'Bahasa';
+$lang['config_timezone'] = 'Zona Waktu';
+$lang['config_currency_symbol'] = 'Simbol Mata Uang';
+$lang['config_currency_side'] = 'Sisi Kanan'; //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
@@ -32,5 +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';
+$lang['config_tax_included'] = 'Dikenakan Pajak';
 ?>
\ No newline at end of file
diff --git a/application/language/id/customers_lang.php b/application/language/id/customers_lang.php
index ca8c9a200..90ae27908 100644
--- a/application/language/id/customers_lang.php
+++ b/application/language/id/customers_lang.php
@@ -4,13 +4,13 @@ $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_error_adding_updating'] = 'Menambah / Memperbarui Pelanggan Salah';
 $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_successful_deleted'] = 'Anda telah berhasil menghapus pelanggan';
 $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_account_number'] = 'No.Pelanggan';
 $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
index f2152d70c..5bdbf1ee3 100644
--- a/application/language/id/employees_lang.php
+++ b/application/language/id/employees_lang.php
@@ -4,24 +4,24 @@ $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_error_adding_updating'] = 'Kesalahan 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_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'] = 'Nama Pengguna';
+$lang['employees_password'] = 'Kata Sandi';
+$lang['employees_repeat_password'] = 'Ulang Kata Sandi';
+$lang['employees_username_required'] = 'Nama Pengguna wajib diisi';
+$lang['employees_username_minlength'] = 'Nama Pengguna minimal 5 huruf';
+$lang['employees_password_required'] = 'Kata Sandi wajib diisi';
+$lang['employees_password_minlength'] = 'Kata Sandi minimal 8 huruf/angka';
+$lang['employees_password_must_match'] = 'Kata Sandi 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';
+$lang['employees_permission_desc'] = 'Tandai kotak di bawah ini untuk memberikan akses ke Modul';
+$lang['employees_error_updating_demo_admin'] = 'Anda tidak dapat merubah Demo admin user';
+$lang['employees_error_deleting_demo_admin'] = 'Anda tidak dapat menghapus Demo admin user';
 ?>
\ No newline at end of file
diff --git a/application/language/id/giftcards_lang.php b/application/language/id/giftcards_lang.php
index bb740895a..056e91908 100644
--- a/application/language/id/giftcards_lang.php
+++ b/application/language/id/giftcards_lang.php
@@ -1,69 +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_giftcard_number'] = 'Nomor GiftCard';
+$lang['giftcards_card_value'] = 'Nilai';
+$lang['giftcards_basic_information'] = 'Informasi GiftCard';
+$lang['giftcards_number_required'] = 'Nomor GiftCard wajib diisi';
+$lang['giftcards_value_required'] = 'Nilai GiftCard wajib diisi';
+$lang['giftcards_number'] = 'Nomor GiftCard harus angka';
+$lang['giftcards_value'] = 'Nilai GiftCard harus angka';
+$lang['giftcards_person_id'] = 'Nomor Pelanggan';
+$lang['giftcards_retrive_giftcard_info'] = 'Informasi GiftCard';
+$lang['giftcards_description'] = 'Deskripsi';
 $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_upc_database'] = 'Database UPC';
+$lang['giftcards_cannot_find_giftcard'] = 'Informasi GiftCard tidak ditemukan';
+$lang['giftcards_info_provided_by'] = 'Informasi disediakan oleh';
+$lang['giftcards_number_information'] = 'Nomor GiftCard';
+$lang['giftcards_new'] = 'GiftCard Baru';
+$lang['giftcards_update'] = 'Ubah GiftCard';
+$lang['giftcards_giftcard'] = 'GiftCard';
+$lang['giftcards_edit_multiple_giftcards'] = 'Ubah beberapa GiftCard';
+$lang['giftcards_category'] = 'Kategori';
+$lang['giftcards_cost_price'] = 'Harga Pokok';
+$lang['giftcards_unit_price'] = 'Harga Jual';
+$lang['giftcards_tax_1'] = 'Pajak 1';
+$lang['giftcards_tax_2'] = 'Pajak 2';
+$lang['giftcards_sales_tax_1'] = 'Pajak Penjualan';
+$lang['giftcards_sales_tax_2'] = 'Pajak Penjualan';
+$lang['giftcards_tax_percent'] = 'Persen Pajak';
+$lang['giftcards_tax_percents'] = 'Persentase Pajak';
+$lang['giftcards_reorder_level'] = 'Level Pesan Ulang';
+$lang['giftcards_quantity'] = 'Jumlah';
+$lang['giftcards_no_giftcards_to_display'] = 'Tidak ada GiftCard yang ditampilkan';
+$lang['giftcards_bulk_edit'] = 'Ubah Massal';
+$lang['giftcards_confirm_delete'] = 'Apakah anda yakin ingin menghapus GiftCard yang dipilih?';
+$lang['giftcards_none_selected'] = 'Anda belum memilih GiftCard untuk diubah';
+$lang['giftcards_confirm_bulk_edit'] = 'Apakah Anda yakin ingin merubah semua GiftCard yang dipilih?';
+$lang['giftcards_successful_bulk_edit'] = 'Anda telah berhasil memperbarui GiftCard yang dipilih';
+$lang['giftcards_error_updating_multiple'] = 'Kesalahan memperbarui GiftCard';
+$lang['giftcards_edit_fields_you_want_to_update'] = 'Ubah bagian yang ingin Anda edit untuk SEMUA GiftCard yang dipilih';
+$lang['giftcards_error_adding_updating'] = 'Kesalahan ketika menambahkan/memperbaharui GiftCard';
+$lang['giftcards_successful_adding'] = 'GiftCard telah berhasil ditambahkan';
+$lang['giftcards_successful_updating'] = 'GiftCard telah berhasil diperbarui';
+$lang['giftcards_successful_deleted'] = 'GiftCard telah berhasil dihapus';
+$lang['giftcards_one_or_multiple'] = 'GiftCard';
+$lang['giftcards_cannot_be_deleted'] = 'Tidak dapat menghapus GiftCard terpilih, Satu atau lebih GiftCard yang dipilih memiliki Penjualan.';
+$lang['giftcards_none'] = 'Tidak Ada';
 $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';
+$lang['giftcards_generate_barcodes'] = 'Buat Barcode';
+$lang['giftcards_must_select_giftcard_for_barcode'] = 'Anda harus memilih minimal 1 GiftCard untuk membuat Barcode';
+$lang['giftcards_excel_import_failed'] = 'Impor dari Excel import tidak berhasil';
+$lang['giftcards_allow_alt_description'] = 'Deskripsi Alternatif dimungkinkan';
+$lang['giftcards_is_serialized'] = 'GiftCard Memiliki Nomor Serial';
+$lang['giftcards_low_inventory_giftcards'] = 'GiftCard Inventori Rendah';
+$lang['giftcards_serialized_giftcards'] = 'Serial GiftCard';
+$lang['giftcards_no_description_giftcards'] = 'Tidak ada Deskripsi Gift Card';
+$lang['giftcards_inventory_comments'] = 'Keterangan';
+$lang['giftcards_count'] = 'Mutasi/Penyesuaian Inventori';
+$lang['giftcards_details_count'] = 'Jumlah Detail Inventori';
+$lang['giftcards_add_minus'] = 'Penyesuaian Inventori TAMBAH / KURANG (-)';
+$lang['giftcards_current_quantity'] = 'Jumlah saat ini';
+$lang['giftcards_quantity_required'] = 'Jumlah wajib diisi. Silahkan tutup ( X ) untuk batal';
+$lang['giftcards_do_nothing'] = 'Tidak ada Perubahan';
+$lang['giftcards_change_all_to_serialized'] = 'Ubah semua menggunakan nomor serial';
+$lang['giftcards_change_all_to_unserialized'] = 'Ubah semua tanpa nomor serial';
+$lang['giftcards_change_all_to_allow_alt_desc'] = 'Diijinkan Deskripsi Alternatif Untuk Semua';
+$lang['giftcards_change_all_to_not_allow_allow_desc'] = 'Tidak Diijinkan Deskripsi Alternatif Untuk Semua';
+$lang['giftcards_use_inventory_menu'] = 'Gunakan Inv. Menu';
+$lang['giftcards_manually_editing_of_quantity'] = 'Perubahan jumlah Stok secara manual';
 ?>
\ No newline at end of file
diff --git a/application/language/id/item_kits_lang.php b/application/language/id/item_kits_lang.php
index 601fae62d..b98a195d8 100644
--- a/application/language/id/item_kits_lang.php
+++ b/application/language/id/item_kits_lang.php
@@ -1,20 +1,20 @@
 <?php
-$lang['item_kits_name'] = 'Item Kit Name';
-$lang['item_kits_description'] = 'Item Kit Description';
-$lang['item_kits_no_item_kits_to_display'] = 'No item kits to display';
-$lang['item_kits_update'] = 'Update Item Kit';
-$lang['item_kits_new'] = 'New Item Kit';
-$lang['item_kits_none_selected'] = "You have not selected any item kits";
-$lang['item_kits_info'] = 'Item Kit Info';
-$lang['item_kits_successful_adding'] = 'You have successfully added Item Kit';
-$lang['item_kits_successful_updating'] = 'You have successfully updated Item Kit';
-$lang['item_kits_error_adding_updating'] = 'Error adding/updating Item Kit';
-$lang['item_kits_successful_deleted'] = 'You have successfully deleted';
-$lang['item_kits_confirm_delete'] = 'Are you sure you want to delete the selected item kits?';
-$lang['item_kits_one_or_multiple'] = 'Item Kit(s)';
-$lang['item_kits_cannot_be_deleted'] = 'Could not delete item kit(s)';
-$lang['item_kits_add_item'] = 'Add Item';
-$lang['item_kits_items'] = 'Items';
-$lang['item_kits_item'] = 'Item';
-$lang['item_kits_quantity'] = 'Quantity';
+$lang['item_kits_name'] = 'Nama Item Paket';
+$lang['item_kits_description'] = 'Deskripsi Item Paket';
+$lang['item_kits_no_item_kits_to_display'] = 'Tidak ada Item Paket yang ditampilkan';
+$lang['item_kits_update'] = 'Ubah Item Paket';
+$lang['item_kits_new'] = 'Item Paket Baru';
+$lang['item_kits_none_selected'] = "Anda belum memilih satupun Item Paket";
+$lang['item_kits_info'] = 'Item Paket Info';
+$lang['item_kits_successful_adding'] = 'Item Paket Baru berhasil ditambahkan';
+$lang['item_kits_successful_updating'] = 'Item Paket berhasil dirubah';
+$lang['item_kits_error_adding_updating'] = 'Tambah/Ubah Item Paket tidak berhasil';
+$lang['item_kits_successful_deleted'] = 'Item Paket berhasil dihapus';
+$lang['item_kits_confirm_delete'] = 'Apakah Anda yakin ingin menghapus Item Paket dipilih?';
+$lang['item_kits_one_or_multiple'] = 'Item Paket';
+$lang['item_kits_cannot_be_deleted'] = 'Item Paket tidak dapat dihapus';
+$lang['item_kits_add_item'] = 'Tambah Item Barang';
+$lang['item_kits_items'] = 'Item Barang';
+$lang['item_kits_item'] = 'Item Barang';
+$lang['item_kits_quantity'] = 'Jumlah';
 ?>
diff --git a/application/language/id/items_lang.php b/application/language/id/items_lang.php
index a6cf78e93..801d16cdf 100644
--- a/application/language/id/items_lang.php
+++ b/application/language/id/items_lang.php
@@ -1,24 +1,24 @@
 <?php
 $lang['items_item_number'] = 'UPC/EAN/ISBN';
-$lang['items_retrive_item_info'] = 'Dapatkan Info Produk/Item';
+$lang['items_retrive_item_info'] = 'Dapatkan Info Item Barang';
 $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_number_information'] = 'Nomor Barang';
+$lang['items_new'] = 'Buat Item Baru';
+$lang['items_update'] = 'Ubah';
 $lang['items_item'] = 'Item';
 $lang['items_edit_multiple_items'] = 'Ubah Beberapa Item';
-$lang['items_name'] = 'Nama Item';
+$lang['items_name'] = 'Nama Barang';
 $lang['items_category'] = 'Kategori';
-$lang['items_cost_price'] = 'Biaya Item';
-$lang['items_unit_price'] = 'Harga Satuan';
+$lang['items_cost_price'] = 'Harga Pokok';
+$lang['items_unit_price'] = 'Harga Jual';
 $lang['items_tax_1'] = 'Pajak 1';
 $lang['items_tax_2'] = 'Pajak 2';
-$lang['items_sales_tax_1'] = 'Pajak Penjualan';
+$lang['items_sales_tax_1'] = 'Pajak Penjualan1';
 $lang['items_sales_tax_2'] = 'Pajak Penjualan2';
 $lang['items_tax_percent'] = 'Tarif Pajak';
 $lang['items_tax_percents'] = 'Tarif Pajak';
@@ -29,15 +29,15 @@ $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_confirm_bulk_edit'] = 'Apakah Anda yakin ingin merubah 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_error_updating_multiple'] = 'Kesalahan ketika memperbarui 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'] = 'Kesalahan ketika menambahkan/memperbarui item';
+$lang['items_successful_adding'] = 'Item Barang telah berhasil ditambahkan';
+$lang['items_successful_updating'] = 'Item Barang telah berhasil diperbarui';
+$lang['items_successful_deleted'] = 'Item Barang telah berhasil dihapus';
+$lang['items_one_or_multiple'] = 'Item Barang';
 $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';
@@ -51,31 +51,31 @@ $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_none'] = 'Tidak Ada';
 $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
+$lang['items_generate_barcodes'] = 'Buat Barcode';
+$lang['items_must_select_item_for_barcode'] = 'Anda harus memilih minimal 1 item untuk membuat barcode';
+$lang['items_excel_import_failed'] = 'Impor dari Excel tidak berhasil dilakukan';
+$lang['items_allow_alt_description'] = 'Deskripsi Alternatif dimungkinkan';
+$lang['items_is_serialized'] = 'Item Memiliki Nomor Serial';
+$lang['items_low_inventory_items'] = 'Item Inventori Rendah';
+$lang['items_serialized_items'] = 'Serial Item';
+$lang['items_no_description_items'] = 'Produk/Item tidak ada deskripsi';
+$lang['items_search_custom_items'] = 'Cari secara manual';//GARRISON ADDED
+$lang['items_inventory_comments'] = 'Keterangan';
+$lang['items_count'] = 'Mutasi/Penyesuaian Inventori';
+$lang['items_details_count'] = 'Jumlah Detail Inventori';
+$lang['items_add_minus'] = 'Penyesuaian Inventori TAMBAH / KURANG (-)';
+$lang['items_current_quantity'] = 'Jumlah Saat ini';
+$lang['items_quantity_required'] = 'Jumlah wajib diisi. Silahkan tutup ( X ) untuk batal';
+$lang['items_do_nothing'] = 'Tidak ada Perubahan';
+$lang['items_change_all_to_serialized'] = 'Ubah semua menggunakan nomor serial';
+$lang['items_change_all_to_unserialized'] = 'Ubah semua tanpa nomor serial';
+$lang['items_change_all_to_allow_alt_desc'] = ' Diijinkan Deskripsi alternatif untuk semua';
+$lang['items_change_all_to_not_allow_allow_desc'] = 'Tidak Diijinkan Deskripsi alternatif untuk semua';
+$lang['items_use_inventory_menu'] = 'Gunakan Inv. Menu';
+$lang['items_manually_editing_of_quantity'] = 'Perubahan jumlah Stok secara manual';
+$lang['items_inventory'] = 'Inventori';
+$lang['items_location'] = 'Lokasi Barang';
+$lang['items_is_deleted'] = 'Item dihapus';// Parq 131215
 ?>
\ No newline at end of file
diff --git a/application/language/id/login_lang.php b/application/language/id/login_lang.php
index e3e540262..7b528e3b2 100644
--- a/application/language/id/login_lang.php
+++ b/application/language/id/login_lang.php
@@ -1,8 +1,8 @@
 <?php
 $lang['login_login'] = 'Masuk';
-$lang['login_username'] = 'Nama pengguna';
+$lang['login_username'] = 'Nama Anda';
 $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.';
+$lang['login_invalid_username_and_password'] = 'Nama Pengguna/Kata Kunci Salah';
+$lang['login_welcome_message'] = 'SELAMAT DATANG. Silahkan login untuk masuk aplikasi, Isikan Nama Pengguna dan Kata Kunci Anda di bawah ini.';
 ?>
diff --git a/application/language/id/module_lang.php b/application/language/id/module_lang.php
index 4aaaed19c..43b105b44 100644
--- a/application/language/id/module_lang.php
+++ b/application/language/id/module_lang.php
@@ -2,33 +2,33 @@
 $lang['module_home'] = 'Beranda';
 
 $lang['module_customers'] = 'Pelanggan';
-$lang['module_customers_desc'] = 'Tambah, Update, Hapus, dan Cari pelanggan ';
+$lang['module_customers_desc'] = 'Tambah, Rubah, Hapus, dan Cari Pelanggan ';
 
 $lang['module_suppliers'] = 'Pemasok';
-$lang['module_suppliers_desc'] = 'Tambah, Update, Hapus, dan Cari pemasok';
+$lang['module_suppliers_desc'] = 'Tambah, Rubah, Hapus, dan Cari Pemasok';
 
 $lang['module_employees'] = 'Karyawan';
-$lang['module_employees_desc'] = 'Tambah, Update, Hapus, dan Cari karyawan';
+$lang['module_employees_desc'] = 'Tambah, Rubah, Hapus, dan Cari Karyawan';
 
 $lang['module_sales'] = 'Penjualan';
-$lang['module_sales_desc'] = 'Proses penjualan dan retur';
+$lang['module_sales_desc'] = 'Proses Penjualan dan Retur';
 
 $lang['module_reports'] = 'Laporan';
-$lang['module_reports_desc'] = 'Lihat dan Hasilkan laporan';
+$lang['module_reports_desc'] = 'Lihat dan Cetak Laporan';
 
-$lang['module_items'] = 'Produk/Item';
-$lang['module_items_desc'] = 'Tambah, Update, Hapus, dan Cari produk/items';
+$lang['module_items'] = 'Item Barang';
+$lang['module_items_desc'] = 'Tambah, Rubah, Hapus, dan Cari Item Barang';
 
-$lang['module_config'] = 'Konfigurasi Toko';
-$lang['module_config_desc'] = 'Ubah konfigurasi toko';
+$lang['module_config'] = 'Konfigurasi';
+$lang['module_config_desc'] = 'Ubah Konfigurasi Toko';
 
-$lang['module_receivings'] = 'Receivings';
-$lang['module_receivings_desc'] = 'Process Purchase orders';
+$lang['module_receivings'] = 'Penerimaan';
+$lang['module_receivings_desc'] = 'Proses Order Penerimaan Barang Masuk';
 
-$lang['module_giftcards'] = 'Gift Cards';
-$lang['module_giftcards_desc'] = 'Add, Update, Delete and Search gift cards';
+$lang['module_giftcards'] = 'Gift Card';
+$lang['module_giftcards_desc'] = 'Tambah, Rubah, Hapus dan Cari Gift Card';
 
-$lang['module_item_kits'] = 'Item Kits';
-$lang['module_item_kits_desc'] = 'Add, Update, Delete and Search Item Kits';
+$lang['module_item_kits'] = 'Item Paket';
+$lang['module_item_kits_desc'] = 'Tambah, Rubah, Hapus dan Cari Item Paket';
 
 ?>
diff --git a/application/language/id/receivings_lang.php b/application/language/id/receivings_lang.php
index efeb84355..e84b9da76 100644
--- a/application/language/id/receivings_lang.php
+++ b/application/language/id/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_register'] = 'Penerimaan Barang Masuk';
+$lang['recvs_mode'] = 'Jenis Penerimaan';
+$lang['recvs_receiving'] = 'Barang Masuk';
+$lang['recvs_return'] = 'Retur';
 $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';
+$lang['recvs_cost'] = 'Harga';
+$lang['recvs_quantity'] = 'Jumlah';
+$lang['recvs_discount'] = 'Diskon %';
+$lang['recvs_edit'] = 'Ubah';
+$lang['recvs_new_supplier'] = 'Pemasok Baru';
+$lang['recvs_supplier'] = 'Pemasok';
+$lang['recvs_select_supplier'] = 'Pilih Pemasok (Opsional)';
+$lang['recvs_start_typing_supplier_name'] = 'Ketik nama pemasok ...';
+$lang['recvs_unable_to_add_item'] = 'Item tidak dapat ditambahkan ke penerimaan barang masuk';
+$lang['recvs_error_editing_item'] = 'Pengubahan Item Salah';
+$lang['recvs_receipt'] = 'Faktur Penerimaan';
+$lang['recvs_complete_receiving'] = 'Selesai';
+$lang['recvs_confirm_finish_receiving'] = 'Apakah anda yakin untuk memproses Penerimaan Barang masuk ini? Proses ini tidak dapat dibatalkan.';
+$lang['recvs_confirm_cancel_receiving'] = 'Apakah anda yakin untuk menghapus Penerimaan Barang masuk ini? Semua item Akan dihapus.';
+$lang['recvs_find_or_scan_item'] = 'Cari/Scan Item';
+$lang['recvs_find_or_scan_item_or_receipt'] = 'Cari/Scan Item ATAU Faktur';
+$lang['recvs_id'] = 'ID Penerimaan';
+$lang['recvs_item_name'] = 'Nama Item';
+$lang['receivings_transaction_failed'] = 'Transaksi Penerimaan Salah';
 ?>
diff --git a/application/language/id/reports_lang.php b/application/language/id/reports_lang.php
index f2c7156fb..ac6fb5741 100644
--- a/application/language/id/reports_lang.php
+++ b/application/language/id/reports_lang.php
@@ -1,14 +1,14 @@
 <?php
-$lang['reports_reports'] = 'Laporan';
+$lang['reports_reports'] = 'Lihat dan Cetak Laporan';
 $lang['reports_report'] = 'Laporan';
-$lang['reports_welcome_message'] = 'Selamat Datang ke panel laporan. Silakan pilih laporan untuk melihat.';
+$lang['reports_welcome_message'] = 'Selamat Datang ke panel laporan. Silakan pilih laporan untuk melihat/cetak.';
 $lang['reports_sales_summary_report'] = 'Laporan Ringkasan Penjualan';
 $lang['reports_categories_summary_report'] = 'Laporan Ringkasan Kategori';
 $lang['reports_customers_summary_report'] = 'Laporan Ringkasan Pelanggan';
 $lang['reports_suppliers_summary_report'] = 'Laporan Ringkasan Pemasok';
 $lang['reports_items_summary_report'] = 'Laporan Ringkasan Produk/Item';
 $lang['reports_employees_summary_report'] = 'Laporan Ringkasan Karyawan';
-$lang['reports_taxes_summary_report'] = 'Taxes Summary Report';
+$lang['reports_taxes_summary_report'] = 'Laporan Ringkasan Pajak';
 $lang['reports_date'] = 'Tanggal';
 $lang['reports_name'] = 'Nama';
 $lang['reports_quantity_purchased'] = 'Jumlah Dibeli';
@@ -23,11 +23,11 @@ $lang['reports_item'] = 'Produk/Item';
 $lang['reports_items'] = 'Produk/Item';
 $lang['reports_supplier'] = 'Pemasok';
 $lang['reports_employees'] = 'Karyawan';
-$lang['reports_subtotal'] = 'Subtotal';
+$lang['reports_subtotal'] = 'SubTotal';
 $lang['reports_total'] = 'Total';
 $lang['reports_tax'] = 'Pajak';
-$lang['reports_profit'] = 'Profit';
-$lang['reports_report_input'] = 'Input Laporan';
+$lang['reports_profit'] = 'Keuntungan/Laba';
+$lang['reports_report_input'] = 'Input data Laporan';
 $lang['reports_type'] = 'Tipe';
 $lang['reports_date_range'] = 'Rentang Tanggal';
 $lang['reports_today'] = 'Hari ini';
@@ -38,7 +38,7 @@ $lang['reports_last_month'] = 'Bulan lalu';
 $lang['reports_this_year'] = 'Tahun ini';
 $lang['reports_last_year'] = 'Tahun lalu';
 $lang['reports_all_time'] = 'Semua Waktu';
-$lang['reports_detailed_sales_report'] = 'Laporan Penjualan Rinci';
+$lang['reports_detailed_sales_report'] = 'Laporan Perincian Penjualan';
 $lang['reports_comments'] = 'Catatan';
 $lang['reports_discount'] = 'Diskon';
 $lang['reports_payment_type'] = 'Tipe Pembayaran';
@@ -46,43 +46,43 @@ $lang['reports_sales'] = 'Penjualan';
 $lang['reports_categories'] = 'Kategori';
 $lang['reports_customers'] = 'Pelanggan';
 $lang['reports_suppliers'] = 'Pemasok';
-$lang['reports_items'] = 'Item';
+$lang['reports_items'] = 'Produk/Item';
 $lang['reports_employees'] = 'Karyawan';
-$lang['reports_taxes'] = 'Taxes';
+$lang['reports_taxes'] = 'Pajak';
 $lang['reports_customer'] = 'Pelanggan';
 $lang['reports_employee'] = 'Karyawan';
-$lang['reports_tax_percent'] = 'Tax Percent';
-$lang['reports_quantity_purchased'] = 'Quantity Purchased';
+$lang['reports_tax_percent'] = 'Persentase Pajak';
+$lang['reports_quantity_purchased'] = 'Jumlah Penjualan';
 $lang['reports_serial_number'] = 'Serial #';
-$lang['reports_description'] = 'Description';
-$lang['reports_date'] = 'Date';
-$lang['reports_sales_amount'] = 'Sales amount';
-$lang['reports_revenue'] = 'Revenue';
-$lang['reports_discounts'] = 'Discounts';
-$lang['reports_discounts_summary_report'] = 'Discounts Summary Report';
-$lang['reports_discount_percent'] = 'Discount Percent';
-$lang['reports_count'] = 'Count';
-$lang['reports_summary_reports'] = 'Summary Reports';
-$lang['reports_graphical_reports'] = 'Graphical Reports';
-$lang['reports_detailed_reports'] = 'Detailed Reports';
-$lang['reports_inventory_reports'] = 'Inventory Reports';
-$lang['reports_low_inventory'] = 'Low Inventory';
-$lang['reports_inventory_summary'] = ' Inventory Summary';
-$lang['reports_item_number'] = 'Item Number';
-$lang['reports_reorder_level'] = 'Reorder Level';
-$lang['reports_low_inventory_report'] = 'Low Inventory Report';
-$lang['reports_item_name'] = 'Item Name';
-$lang['reports_inventory_summary_report'] = 'Inventory Summary Report';
-$lang['reports_payment_type'] = 'Payment Type';
-$lang['reports_payments_summary_report'] = 'Payments Summary Report';
-$lang['reports_payments'] = 'Payments';
-$lang['reports_receivings'] = 'Receivings';
-$lang['reports_received_by'] = 'Received By';
-$lang['reports_supplied_by'] = 'Supplied by';
-$lang['reports_items_received'] = 'Items Received';
-$lang['reports_detailed_receivings_report'] = 'Detailed Receivings Report';
-$lang['reports_sale_type'] = 'Sale Type';
-$lang['reports_all'] = 'All';
-$lang['reports_returns'] = 'Returns';
-$lang['reports_discount'] = 'A discount greater than ';
+$lang['reports_description'] = 'Deskripsi';
+$lang['reports_date'] = 'Tanggal';
+$lang['reports_sales_amount'] = 'Jumlah Penjualan';
+$lang['reports_revenue'] = 'Pendapatan';
+$lang['reports_discounts'] = 'Diskon';
+$lang['reports_discounts_summary_report'] = 'Laporan Ringkasan Diskon';
+$lang['reports_discount_percent'] = 'Persen Diskon';
+$lang['reports_count'] = 'Jumlah';
+$lang['reports_summary_reports'] = 'Ringkasan Laporan';
+$lang['reports_graphical_reports'] = 'Laporan Dalam Bentuk Grafis';
+$lang['reports_detailed_reports'] = 'Perincian Laporan';
+$lang['reports_inventory_reports'] = 'Laporan Inventori';
+$lang['reports_low_inventory'] = 'Laporan Inventori Rendah';
+$lang['reports_inventory_summary'] = 'Laporan Ringkasan Inventori';
+$lang['reports_item_number'] = 'Nomor Barang';
+$lang['reports_reorder_level'] = 'Level Pesan Ulang';
+$lang['reports_low_inventory_report'] = 'Laporan Inventori Rendah';
+$lang['reports_item_name'] = 'Nama Barang';
+$lang['reports_inventory_summary_report'] = 'Laporan Ringkasan Inventori';
+$lang['reports_payment_type'] = 'Jenis Pembayaran';
+$lang['reports_payments_summary_report'] = 'Laporan Ringkasan Pembayaran';
+$lang['reports_payments'] = 'Pembayaran';
+$lang['reports_receivings'] = 'Barang Masuk';
+$lang['reports_received_by'] = 'Diterima Oleh';
+$lang['reports_supplied_by'] = 'Pemasok';
+$lang['reports_items_received'] = 'Barang Masuk';
+$lang['reports_detailed_receivings_report'] = 'Laporan Detail Barang Masuk';
+$lang['reports_sale_type'] = 'Jenis Penjualan';
+$lang['reports_all'] = 'Semua';
+$lang['reports_returns'] = 'Retur';
+$lang['reports_discount'] = 'Diskon diatas dari';
 ?>
\ No newline at end of file
diff --git a/application/language/id/sales_lang.php b/application/language/id/sales_lang.php
index ec25b4ecc..024f30fc6 100644
--- a/application/language/id/sales_lang.php
+++ b/application/language/id/sales_lang.php
@@ -1,88 +1,86 @@
 <?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_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_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';
-$lang ['sales_transaction_failed'] = 'Sales Transaction Failed';
-$lang ['sales_must_enter_numeric'] = 'Must enter numeric value for amount tendered';
-$lang ['sales_must_enter_numeric_giftcard'] = 'Must enter numeric value for giftcard number';
-$lang ['sales_serial'] = 'Serial';
-$lang ['sales_description_abbrv'] = 'Desc';
-$lang ['sales_item_out_of_stock'] = 'Item is Out of Stock';
-$lang ['sales_item_insufficient_of_stock'] = 'Item is Insufficient of Stock';
-$lang ['sales_quantity_less_than_zero'] = 'Warning, Desired Quantity is Insufficient. You can still process the sale, but check your inventory';
-$lang ['sales_successfully_updated'] = 'Sale sucessfully updated';
-$lang ['sales_unsuccessfully_updated'] = 'Sale unsucessfully updated';
-$lang ['sales_edit_sale'] = 'Edit Sale';
-$lang ['sales_employee'] = 'Employee';
-$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_delete_successful'] = 'You have successfully deleted a sale';
-$lang ['sales_delete_unsuccessful'] = 'You have unsuccessfully deleted a sale';
-$lang ['sales_suspend_sale'] = 'Suspend Sale';
-$lang ['sales_confirm_suspend_sale'] = 'Are you sure you want to suspend this sale?';
-$lang ['sales_suspended_sales'] = 'Suspended Sales';
-$lang ['sales_suspended_sale_id'] = 'Suspended Sale ID';
-$lang ['sales_date'] = 'Date';
-$lang ['sales_comments'] = 'Comments';
-$lang ['sales_unsuspend_and_delete'] = 'Unsuspend and Delete';
-$lang ['sales_unsuspend'] = 'Unsuspend';
-$lang ['sales_successfully_suspended_sale'] = 'Your sale has been successfully suspended';
-$lang ['sales_email_receipt'] = 'E-Mail Receipt';
-$lang ['sales_discount_short'] = '%';
-$lang ["sales_discount_included"] = '% Discount';
-$lang ['sales_sale_time'] = 'Time';
-$lang ['sales_payments_total'] = 'Payments Total';
-$lang ['sales_amount_due'] = 'Amount Due';
-$lang ['sales_payment_type'] = "Type";
-$lang ['sales_payment_amount'] = "Amount";
-<<<<<<< HEAD
-=======
-$lang ['sales_basic_information'] = "Sale information";
->>>>>>> master
+$lang['sales_giftcard_number'] = 'Nomor Gift Card';
+$lang['sales_giftcard'] = 'Gift Card';
+$lang['sales_register'] = 'Transaksi Penjualan';
+$lang['sales_mode'] = 'Jenis Transaksi';
+$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 Belanja';
+$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'] = 'Type 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 Faktur';
+$lang['sales_select_customer'] = 'Pilih Pelanggan (Opsional)';
+$lang['sales_start_typing_item_name'] = 'Ketik Nama Barang atau Scan Barcode...';
+$lang['sales_start_typing_customer_name'] = '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'] = 'mengubah item salah';
+$lang['sales_complete_sale'] = 'Entri penjualan';
+$lang['sales_cancel_sale'] = 'Batal Jual';
+$lang['sales_add_payment'] = 'TERIMA';
+$lang['sales_receipt'] = 'Faktur Penjualan';
+$lang['sales_receipt_number']='POS #';
+$lang['sales_id'] = 'ID Penjualan';
+$lang['sales_sale'] = 'Penjualan';
+$lang['sales_return'] = 'Retur';
+$lang['sales_confirm_finish_sale'] = 'Anda yakin ingin melakukan transaksi penjualan ini?  Proses tidak dapat dibatalkan.';
+$lang['sales_confirm_cancel_sale'] = 'Anda yakin ingin membatalkan 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'] = 'Kembalian Uang';
+$lang['sales_payment_not_cover_total'] = 'Jumlah pembayaran tidak mencakup Total';
+$lang['sales_transaction_failed'] = 'Transaksi Penjualan Salah';
+$lang['sales_must_enter_numeric'] = 'Nilai yang dimasukkan harus angka numerik';
+$lang['sales_must_enter_numeric_giftcard'] = 'Nomor Gift Card harus angka numerik';
+$lang['sales_serial'] = 'Serial';
+$lang['sales_description_abbrv'] = 'Deskripsi';
+$lang['sales_item_out_of_stock'] = 'Item tidak ada stok';
+$lang['sales_item_insufficient_of_stock'] = 'Stok Item tidak mencukupi';
+$lang['sales_quantity_less_than_zero'] = 'Peringatan!... Stok Inventori Kosong. Proses penjualan masih dapat dilanjutkan, Periksa Inventori.';
+$lang['sales_successfully_updated'] = 'Penjualan berhasil diperbarui';
+$lang['sales_unsuccessfully_updated'] = 'Penjualan tidak berhasil diperbarui';
+$lang['sales_edit_sale'] = 'Ubah Penjualan';
+$lang['sales_employee'] = 'Karyawan';
+$lang['sales_successfully_deleted'] = 'Transaksi Penjualan berhasil dihapus';
+$lang['sales_unsuccessfully_deleted'] = 'Transaksi Penjualan tidak berhasil dihapus';
+$lang['sales_delete_entire_sale'] = 'Hapus Transaksi Penjualan';
+$lang['sales_delete_confirmation'] = 'Apakah anda yakin ingin menghapus transaksi penjualan ini, Pilihan ini tidak dapat dibatalkan';
+$lang['sales_delete_successful'] = 'Transaksi Penjualan berhasil dihapus';
+$lang['sales_delete_unsuccessful'] = 'Transaksi Penjualan tidak berhasil dihapus';
+$lang['sales_suspend_sale'] = 'Tangguhkan';
+$lang['sales_confirm_suspend_sale'] = 'Apakah anda yakin akan menangguhkan penjualan ini?';
+$lang['sales_suspended_sales'] = 'Penangguhan';
+$lang['sales_suspended_sale_id'] = 'ID Penjualan ditangguhkan';
+$lang['sales_date'] = 'Tanggal';
+$lang['sales_comments'] = 'Keterangan';
+$lang['sales_unsuspend_and_delete'] = 'Batalkan dan hapus penangguhan';
+$lang['sales_unsuspend'] = 'Batal Penangguhan';
+$lang['sales_successfully_suspended_sale'] = 'Penjualan anda telah berhasil ditangguhkan';
+$lang['sales_email_receipt'] = 'e-Mail Faktur';
+$lang['sales_discount_short']='%';
+$lang["sales_discount_included"]='% Diskon';
+$lang['sales_sale_time']='Waktu';
+$lang['sales_payments_total'] = 'Total Pembayaran';
+$lang['sales_amount_due'] = 'Kembalian Uang';
+$lang['sales_payment_type'] = "Type";
+$lang['sales_payment_amount'] = "Amount";
+$lang['sales_basic_information'] = "Sale information";
 ?>
\ No newline at end of file
diff --git a/application/language/id/suppliers_lang.php b/application/language/id/suppliers_lang.php
index d38485dac..c3b82cf7b 100644
--- a/application/language/id/suppliers_lang.php
+++ b/application/language/id/suppliers_lang.php
@@ -1,17 +1,17 @@
 <?php
 $lang['suppliers_new'] = 'Pemasok Baru';
 $lang['suppliers_supplier'] = 'Pemasok';
-$lang['suppliers_update'] = 'Update Pemasok';
+$lang['suppliers_update'] = 'Ubah data 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_none_selected'] = 'Anda belum memilih pemasok untuk dihapus';
+$lang['suppliers_error_adding_updating'] = 'Kesalahan Menambah / memperbarui data pemasok';
+$lang['suppliers_successful_adding'] = 'Anda telah berhasil menambahkan data pemasok';
+$lang['suppliers_successful_updating'] = 'Anda telah berhasil memperbarui data pemasok';
+$lang['suppliers_successful_deleted'] = 'Anda telah berhasil menghapus data 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';
+$lang['suppliers_account_number'] = 'Nomor Akun Pemasok';
+$lang['suppliers_company_name'] = 'Nama Perusahaan';
+$lang['suppliers_company_name_required'] = 'Nama Perusahaan wajib diisi';
 ?>
\ No newline at end of file
diff --git a/application/language/nl-BE/sales_lang.php b/application/language/nl-BE/sales_lang.php
index 87c0d1b21..867bf5459 100755
--- a/application/language/nl-BE/sales_lang.php
+++ b/application/language/nl-BE/sales_lang.php
@@ -83,8 +83,5 @@ $lang['sales_payments_total'] = 'Betaald bedrag';
 $lang['sales_amount_due'] = 'Te betalen';
 $lang['sales_payment_type'] = "Type";
 $lang['sales_payment_amount'] = "Bedrag";
-<<<<<<< HEAD
-=======
 $lang['sales_basic_information']='Ticket informatie';
->>>>>>> master
 ?>
\ No newline at end of file
diff --git a/application/language/ru/sales_lang.php b/application/language/ru/sales_lang.php
index ce890e378..c946ad029 100644
--- a/application/language/ru/sales_lang.php
+++ b/application/language/ru/sales_lang.php
@@ -33,6 +33,7 @@ $lang['sales_complete_sale'] = 'Завершить продажу';
 $lang['sales_cancel_sale'] = 'Отменить продажу';
 $lang['sales_add_payment'] = 'Добавить оплаты';
 $lang['sales_receipt'] = 'товарный чек';
+$lang['sales_receipt_number']='POS #';
 $lang['sales_id'] = 'Номер Продажы';
 $lang['sales_sale'] = 'Продажа';
 $lang['sales_return'] = 'возвращать';
@@ -81,8 +82,5 @@ $lang['sales_payments_total'] = 'Payments Total';
 $lang['sales_amount_due'] = 'Amount Due';
 $lang['sales_payment_type'] = "тип";
 $lang['sales_payment_amount'] = "количество";
-<<<<<<< HEAD
-=======
 $lang['sales_basic_information'] = "информацию о билетах";
->>>>>>> master
 ?>
\ No newline at end of file
diff --git a/application/language/zh/sales_lang.php b/application/language/zh/sales_lang.php
index 169376067..3001db584 100755
--- a/application/language/zh/sales_lang.php
+++ b/application/language/zh/sales_lang.php
@@ -33,6 +33,7 @@ $lang['sales_complete_sale'] = '完成銷售';
 $lang['sales_cancel_sale'] = '取消銷售';
 $lang['sales_add_payment'] = '新增付款';
 $lang['sales_receipt'] = '銷貨單';
+$lang['sales_receipt_number']='POS #';
 $lang['sales_id'] = '銷售編號';
 $lang['sales_sale'] = '銷售';
 $lang['sales_return'] = '退貨';