diff --git a/application/controllers/sales.php b/application/controllers/sales.php
index 25123f520..606e4c172 100644
--- a/application/controllers/sales.php
+++ b/application/controllers/sales.php
@@ -164,15 +164,14 @@ class Sales extends Secure_area
 			
 			if ( $cur_giftcard_value <= 0 )
 			{
-				$data['error'] = 'Giftcard balance is ' . to_currency( $this->Giftcard->get_giftcard_value( $this->input->post( 'amount_tendered' ) ) ) . ' !';
+				$data['error'] = $this->lang->line('giftcards_remaining_balance', $this->input->post( 'amount_tendered' ), to_currency( $this->Giftcard->get_giftcard_value( $this->input->post( 'amount_tendered' ))));
 				$this->_reload( $data );
 				return;
 			}
-
 			$new_giftcard_value = $this->Giftcard->get_giftcard_value( $this->input->post( 'amount_tendered' ) ) - $this->sale_lib->get_amount_due( );
 			$new_giftcard_value = ( $new_giftcard_value >= 0 ) ? $new_giftcard_value : 0;
 			$this->sale_lib->set_giftcard_remainder($new_giftcard_value);
-			$data['warning'] = 'Giftcard ' . $this->input->post( 'amount_tendered' ) . ' balance is ' . to_currency( $new_giftcard_value ) . ' !';
+			$data['warning'] = $this->lang->line('giftcards_remaining_balance', $this->input->post( 'amount_tendered' ), to_currency( $new_giftcard_value, TRUE ));
 			$payment_amount = min( $this->sale_lib->get_amount_due( ), $this->Giftcard->get_giftcard_value( $this->input->post( 'amount_tendered' ) ) );
 		}
 		else
diff --git a/application/helpers/currency_helper.php b/application/helpers/currency_helper.php
index 81f41f771..d4ca49356 100644
--- a/application/helpers/currency_helper.php
+++ b/application/helpers/currency_helper.php
@@ -1,9 +1,10 @@
 <?php
 /** GARRISON MODIFIED 4/20/2013 **/
-function to_currency($number)
+function to_currency($number,$escape=FALSE)
 {
 	$CI =& get_instance();
 	$currency_symbol = $CI->config->item('currency_symbol') ? $CI->config->item('currency_symbol') : '$';
+	$currency_symbol = $currency_symbol == '$' && $escape ? '\$' : '$'; 
 	$thousands_separator = $CI->config->item('thousands_separator') ? $CI->config->item('thousands_separator') : '';
 	$decimal_point = $CI->config->item('decimal_point') ? $CI->config->item('decimal_point') : '.';
 	if($number >= 0)
diff --git a/application/language/en/giftcards_lang.php b/application/language/en/giftcards_lang.php
index 842e89930..6325fac90 100644
--- a/application/language/en/giftcards_lang.php
+++ b/application/language/en/giftcards_lang.php
@@ -3,6 +3,7 @@
 $lang["giftcards_add_minus"] = "Inventory to add/subtract";
 $lang["giftcards_allow_alt_description"] = "Allow Alt Description";
 $lang["giftcards_amazon"] = "Amazon";
+$lang["giftcards_remaining_balance"] = "Giftcard %1 remaining value is %2!";
 $lang["giftcards_basic_information"] = "Giftcard Information";
 $lang["giftcards_bulk_edit"] = "Bulk Edit";
 $lang["giftcards_cannot_be_deleted"] = "Could not deleted selected giftcards, one or more of the selected giftcards has sales.";
@@ -45,7 +46,6 @@ $lang["giftcards_number_information"] = "Giftcard Number";
 $lang["giftcards_number_required"] = "Giftcard Number is a required field";
 $lang["giftcards_one_or_multiple"] = "giftcard(s)";
 $lang["giftcards_person_id"] = "Customer";
-$lang["giftcards_customer_required"] = "Giftcard customer is a required field";
 $lang["giftcards_quantity"] = "Quantity";
 $lang["giftcards_quantity_required"] = "Quantity is a required field. Please Close ( X ) to cancel";
 $lang["giftcards_reorder_level"] = "Reorder Level";
diff --git a/application/language/es/giftcards_lang.php b/application/language/es/giftcards_lang.php
index 5ec7ffb27..d5f8e22be 100644
--- a/application/language/es/giftcards_lang.php
+++ b/application/language/es/giftcards_lang.php
@@ -3,6 +3,7 @@
 $lang["giftcards_add_minus"] = "Inventario a agregar/substraer";
 $lang["giftcards_allow_alt_description"] = "Permitir Descripción Alternativa";
 $lang["giftcards_amazon"] = "Amazon";
+$lang["giftcards_remaining_balance"] = "Giftcard %1 remaining value is %2!";
 $lang["giftcards_basic_information"] = "Información de Tarjeta de Regalo";
 $lang["giftcards_bulk_edit"] = "Edición Múltiple";
 $lang["giftcards_cannot_be_deleted"] = "No se puede borrar las tarjetas seleccionadas. Una o más tiene ventas.";
@@ -45,7 +46,6 @@ $lang["giftcards_number_information"] = "Número de Tarjeta de Regalo";
 $lang["giftcards_number_required"] = "Número de Tarjeta de Regalo es requerido";
 $lang["giftcards_one_or_multiple"] = "tarjeta(s) de regalo";
 $lang["giftcards_person_id"] = "Customer";
-$lang["giftcards_customer_required"] = "Giftcard customer is a required field";
 $lang["giftcards_quantity"] = "Cantidad";
 $lang["giftcards_quantity_required"] = "Cantidad es requerido. Por favor, haz click en ( X ) para cancelar";
 $lang["giftcards_reorder_level"] = "Cantidad Mínima";
diff --git a/application/language/fr/giftcards_lang.php b/application/language/fr/giftcards_lang.php
index 7cf83bb9b..894aab03e 100644
--- a/application/language/fr/giftcards_lang.php
+++ b/application/language/fr/giftcards_lang.php
@@ -3,6 +3,7 @@
 $lang["giftcards_add_minus"] = "Ajout/Soustraction à l\'inventaire";
 $lang["giftcards_allow_alt_description"] = "Autorisér Description Alt";
 $lang["giftcards_amazon"] = "Amazon";
+$lang["giftcards_remaining_balance"] = "Giftcard %1 remaining value is %2!";
 $lang["giftcards_basic_information"] = "Détails de la Carte";
 $lang["giftcards_bulk_edit"] = "Édition en groupe";
 $lang["giftcards_cannot_be_deleted"] = "Impossible de supprimer. Une ou plusieurs carte(s) ont des ventes.";
@@ -45,7 +46,6 @@ $lang["giftcards_number_information"] = "Numéro de Carte";
 $lang["giftcards_number_required"] = "Le Numéro est requis";
 $lang["giftcards_one_or_multiple"] = "carte(s)";
 $lang["giftcards_person_id"] = "Client";
-$lang["giftcards_customer_required"] = "Giftcard customer is a required field";
 $lang["giftcards_quantity"] = "Quantité";
 $lang["giftcards_quantity_required"] = "La quantité est requise. Veuillez Fermer ( X ) pour annuler";
 $lang["giftcards_reorder_level"] = "Seuil de Réapprovisionnement";
diff --git a/application/language/id/giftcards_lang.php b/application/language/id/giftcards_lang.php
index 9ee5079e0..0ca7d76a5 100644
--- a/application/language/id/giftcards_lang.php
+++ b/application/language/id/giftcards_lang.php
@@ -3,6 +3,7 @@
 $lang["giftcards_add_minus"] = "Penyesuaian Inventori TAMBAH / KURANG (-)";
 $lang["giftcards_allow_alt_description"] = "Deskripsi Alternatif dimungkinkan";
 $lang["giftcards_amazon"] = "Amazon";
+$lang["giftcards_remaining_balance"] = "Giftcard %1 remaining value is %2!";
 $lang["giftcards_basic_information"] = "Informasi GiftCard";
 $lang["giftcards_bulk_edit"] = "Ubah Massal";
 $lang["giftcards_cannot_be_deleted"] = "Tidak dapat menghapus GiftCard terpilih, Satu atau lebih GiftCard yang dipilih memiliki Penjualan.";
@@ -45,7 +46,6 @@ $lang["giftcards_number_information"] = "Nomor GiftCard";
 $lang["giftcards_number_required"] = "Nomor GiftCard wajib diisi";
 $lang["giftcards_one_or_multiple"] = "GiftCard";
 $lang["giftcards_person_id"] = "Nomor Pelanggan";
-$lang["giftcards_customer_required"] = "Giftcard customer is a required field";
 $lang["giftcards_quantity"] = "Jumlah";
 $lang["giftcards_quantity_required"] = "Jumlah wajib diisi. Silahkan tutup ( X ) untuk batal";
 $lang["giftcards_reorder_level"] = "Level Pesan Ulang";
diff --git a/application/language/nl-BE/giftcards_lang.php b/application/language/nl-BE/giftcards_lang.php
index e9100397f..59d215ce8 100644
--- a/application/language/nl-BE/giftcards_lang.php
+++ b/application/language/nl-BE/giftcards_lang.php
@@ -3,6 +3,7 @@
 $lang["giftcards_add_minus"] = "Corrigatie hoeveelheid";
 $lang["giftcards_allow_alt_description"] = "Aanpasbare omschrijving";
 $lang["giftcards_amazon"] = "Amazon";
+$lang["giftcards_remaining_balance"] = "Resterende waarde cadeaubon %1 is %2!";
 $lang["giftcards_basic_information"] = "Cadeaubon Info";
 $lang["giftcards_bulk_edit"] = "Bewerk Selectie";
 $lang["giftcards_cannot_be_deleted"] = "De cadeaubons konden niet worden verwijderd.";
@@ -45,7 +46,6 @@ $lang["giftcards_number_information"] = "Cadeaubon Nummer";
 $lang["giftcards_number_required"] = "Cadeaubon Nummer is een verplicht veld";
 $lang["giftcards_one_or_multiple"] = "cadeaubon(s) verwijderd";
 $lang["giftcards_person_id"] = "Klant";
-$lang["giftcards_customer_required"] = "Klant is een verplicht veld";
 $lang["giftcards_quantity"] = "In stock";
 $lang["giftcards_quantity_required"] = "Hoeveelheid moet ingevuld worden. Druk Sluit ( X ) om te annuleren";
 $lang["giftcards_reorder_level"] = "Reorder Level";
diff --git a/application/language/nl-BE/sales_lang.php b/application/language/nl-BE/sales_lang.php
index e9226e25c..fbd744a9b 100755
--- a/application/language/nl-BE/sales_lang.php
+++ b/application/language/nl-BE/sales_lang.php
@@ -40,7 +40,7 @@ $lang["sales_error_editing_item"] = "Fout bij bewerken";
 $lang["sales_find_or_scan_item"] = "Zoek/Scan Product";
 $lang["sales_find_or_scan_item_or_receipt"] = "Zoek/Scan Product of Ticket";
 $lang["sales_giftcard"] = "Cadeaubon";
-$lang["sales_giftcard_balance"] = "Waardebon Resterend";
+$lang["sales_giftcard_balance"] = "Cadeaubon Resterend";
 $lang["sales_giftcard_number"] = "Cadeaubon nummer";
 $lang["sales_id"] = "Nummer Verkoop ";
 $lang["sales_invoice"] = "Factuur";
diff --git a/application/language/ru/giftcards_lang.php b/application/language/ru/giftcards_lang.php
index b5c67e355..be95f004f 100644
--- a/application/language/ru/giftcards_lang.php
+++ b/application/language/ru/giftcards_lang.php
@@ -3,6 +3,7 @@
 $lang["giftcards_add_minus"] = "Инвентарь для сложения/вычитания";
 $lang["giftcards_allow_alt_description"] = "Разрешить альтернативные Описание";
 $lang["giftcards_amazon"] = "Amazon";
+$lang["giftcards_remaining_balance"] = "Giftcard %1 remaining value is %2!";
 $lang["giftcards_basic_information"] = "информация Подарочную карту";
 $lang["giftcards_bulk_edit"] = "Массовое изменение";
 $lang["giftcards_cannot_be_deleted"] = "Не удалось удалить выбранные подарочные карты, одну или несколько из выбранных подарочные карты имеет продаж.";
@@ -45,7 +46,6 @@ $lang["giftcards_number_information"] = "Номер Подарочную кар
 $lang["giftcards_number_required"] = "Номер Подарочную карту обязательный пробел";
 $lang["giftcards_one_or_multiple"] = "подарочную карту";
 $lang["giftcards_person_id"] = "Клиент";
-$lang["giftcards_customer_required"] = "Giftcard customer is a required field";
 $lang["giftcards_quantity"] = "Количество";
 $lang["giftcards_quantity_required"] = "Количество является обязательным полем. Пожалуйста, закройте (X), чтобы отменить";
 $lang["giftcards_reorder_level"] = "минимальный уровень для перезаказ";
diff --git a/application/language/th/giftcards_lang.php b/application/language/th/giftcards_lang.php
index 578e987e1..fb29d05b7 100644
--- a/application/language/th/giftcards_lang.php
+++ b/application/language/th/giftcards_lang.php
@@ -3,6 +3,7 @@
 $lang["giftcards_add_minus"] = "Inventory to add/subtract";
 $lang["giftcards_allow_alt_description"] = "";
 $lang["giftcards_amazon"] = "Amazon";
+$lang["giftcards_remaining_balance"] = "Giftcard %1 remaining value is %2!";
 $lang["giftcards_basic_information"] = "ข้อมูลบัตรกำนัล";
 $lang["giftcards_bulk_edit"] = "Bulk Edit";
 $lang["giftcards_cannot_be_deleted"] = "Could not deleted selected giftcards, one or more of the selected giftcards has sales.";
@@ -45,7 +46,6 @@ $lang["giftcards_number_information"] = "";
 $lang["giftcards_number_required"] = "ต้องกรอกเลขบัตรกำนัล";
 $lang["giftcards_one_or_multiple"] = "giftcard(s)";
 $lang["giftcards_person_id"] = "เจ้าของบัตร";
-$lang["giftcards_customer_required"] = "Giftcard customer is a required field";
 $lang["giftcards_quantity"] = "ปริมาณ";
 $lang["giftcards_quantity_required"] = "Quantity is a required field. Please Close ( X ) to cancel";
 $lang["giftcards_reorder_level"] = "ยอดขั้นต่ำ";
diff --git a/application/language/tr/giftcards_lang.php b/application/language/tr/giftcards_lang.php
index 842e89930..6325fac90 100644
--- a/application/language/tr/giftcards_lang.php
+++ b/application/language/tr/giftcards_lang.php
@@ -3,6 +3,7 @@
 $lang["giftcards_add_minus"] = "Inventory to add/subtract";
 $lang["giftcards_allow_alt_description"] = "Allow Alt Description";
 $lang["giftcards_amazon"] = "Amazon";
+$lang["giftcards_remaining_balance"] = "Giftcard %1 remaining value is %2!";
 $lang["giftcards_basic_information"] = "Giftcard Information";
 $lang["giftcards_bulk_edit"] = "Bulk Edit";
 $lang["giftcards_cannot_be_deleted"] = "Could not deleted selected giftcards, one or more of the selected giftcards has sales.";
@@ -45,7 +46,6 @@ $lang["giftcards_number_information"] = "Giftcard Number";
 $lang["giftcards_number_required"] = "Giftcard Number is a required field";
 $lang["giftcards_one_or_multiple"] = "giftcard(s)";
 $lang["giftcards_person_id"] = "Customer";
-$lang["giftcards_customer_required"] = "Giftcard customer is a required field";
 $lang["giftcards_quantity"] = "Quantity";
 $lang["giftcards_quantity_required"] = "Quantity is a required field. Please Close ( X ) to cancel";
 $lang["giftcards_reorder_level"] = "Reorder Level";
diff --git a/application/language/zh/giftcards_lang.php b/application/language/zh/giftcards_lang.php
index cb773b22e..c278165c0 100755
--- a/application/language/zh/giftcards_lang.php
+++ b/application/language/zh/giftcards_lang.php
@@ -3,6 +3,7 @@
 $lang["giftcards_add_minus"] = "加/減庫存";
 $lang["giftcards_allow_alt_description"] = "允許使用ALT描述";
 $lang["giftcards_amazon"] = "Amazon";
+$lang["giftcards_remaining_balance"] = "Giftcard %1 remaining value is %2!";
 $lang["giftcards_basic_information"] = "禮金券資訊";
 $lang["giftcards_bulk_edit"] = "批量編輯";
 $lang["giftcards_cannot_be_deleted"] = "無法刪除選定的禮金券，一個或多個所選擇的禮金券已經使用。";
@@ -45,7 +46,6 @@ $lang["giftcards_number_information"] = "禮金券編號";
 $lang["giftcards_number_required"] = "請輸入禮金券編號";
 $lang["giftcards_one_or_multiple"] = "禮金券";
 $lang["giftcards_person_id"] = "Customer";
-$lang["giftcards_customer_required"] = "Giftcard customer is a required field";
 $lang["giftcards_quantity"] = "數量";
 $lang["giftcards_quantity_required"] = "數量是必填字段。請按關閉（X）來取消";
 $lang["giftcards_reorder_level"] = "補貨點";
diff --git a/application/models/giftcard.php b/application/models/giftcard.php
index bc99cf96f..4c90d4904 100644
--- a/application/models/giftcard.php
+++ b/application/models/giftcard.php
@@ -31,7 +31,7 @@ class Giftcard extends CI_Model
 	function get_all($rows=0, $limit_from=0)
 	{
 		$this->db->from('giftcards');
-		$this->db->join('people','people.person_id=giftcards.person_id');//GARRISON ADDED 4/25/2013
+		$this->db->join('people','people.person_id=giftcards.person_id', 'left');//GARRISON ADDED 4/25/2013
 		$this->db->where('deleted',0);
 		$this->db->order_by("giftcard_number");
 		if ($rows > 0) {
@@ -53,7 +53,7 @@ class Giftcard extends CI_Model
 	function get_info($giftcard_id)
 	{
 		$this->db->from('giftcards');
-		$this->db->join('people', 'people.person_id = giftcards.person_id');
+		$this->db->join('people', 'people.person_id = giftcards.person_id', 'left');
 		$this->db->where('giftcard_id',$giftcard_id);
 		$this->db->where('deleted',0);
 		
@@ -177,7 +177,7 @@ class Giftcard extends CI_Model
 
 /** GARRISON MODIFIED 4/24/2013 **/
  		$this->db->from('customers');
-		$this->db->join('people','customers.person_id=people.person_id');
+		$this->db->join('people','customers.person_id=people.person_id', 'left');
 		$this->db->like("first_name",$this->db->escape_like_str($search));
 		$this->db->or_like("last_name",$this->db->escape_like_str($search)); 
 		$this->db->or_like("CONCAT(`first_name`,' ',`last_name`)",$this->db->escape_like_str($search));
@@ -238,7 +238,7 @@ class Giftcard extends CI_Model
 	function search($search, $rows = 0, $limit_from = 0)
 	{
 		$this->db->from('giftcards');
-		$this->db->join('people','giftcards.person_id=people.person_id');
+		$this->db->join('people','giftcards.person_id=people.person_id', 'left');
 		$this->db->like("first_name",$this->db->escape_like_str($search));
 		$this->db->or_like("last_name",$this->db->escape_like_str($search));
 		$this->db->or_like("CONCAT(`first_name`,' ',`last_name`)",$this->db->escape_like_str($search));
@@ -255,7 +255,7 @@ class Giftcard extends CI_Model
 	function get_found_rows($search)
 	{
 		$this->db->from('giftcards');
-		$this->db->join('people','giftcards.person_id=people.person_id');
+		$this->db->join('people','giftcards.person_id=people.person_id', 'left');
 		$this->db->like("first_name",$this->db->escape_like_str($search));
 		$this->db->or_like("last_name",$this->db->escape_like_str($search));
 		$this->db->or_like("CONCAT(`first_name`,' ',`last_name`)",$this->db->escape_like_str($search));
diff --git a/application/views/giftcards/form.php b/application/views/giftcards/form.php
index ab86c287e..77a81b6f1 100644
--- a/application/views/giftcards/form.php
+++ b/application/views/giftcards/form.php
@@ -8,7 +8,7 @@ echo form_open('giftcards/save/'.$giftcard_info->giftcard_id,array('id'=>'giftca
 
 <!-- GARRISON ADDED 4/22/2013 -->
 <div class="field_row clearfix">
-<?php echo form_label($this->lang->line('giftcards_person_id').':', 'name',array('class'=>'required wide')); ?>
+<?php echo form_label($this->lang->line('giftcards_person_id').':', 'name',array('class'=>'wide')); ?>
 	<div class='form_field'>
 	<?php echo form_input(array(
 		'name'=>'person_id',
@@ -108,10 +108,6 @@ $(document).ready(function()
 				required:true,
 				number:true
 			},
-			person_id: 
-			{
-				required: true
-			},
 			value:
 			{
 				required:true,
@@ -129,10 +125,6 @@ $(document).ready(function()
 			{
 				required:"<?php echo $this->lang->line('giftcards_value_required'); ?>",
 				number:"<?php echo $this->lang->line('giftcards_value'); ?>"
-			},
-			person_id: 
-			{
-				required:"<?php echo $this->lang->line('giftcards_customer_required'); ?>"
 			}
 		}
 	});
diff --git a/database/2.3.1_to_2.3.2.sql b/database/2.3.1_to_2.3.2.sql
index ede474617..a6532d535 100644
--- a/database/2.3.1_to_2.3.2.sql
+++ b/database/2.3.1_to_2.3.2.sql
@@ -42,3 +42,6 @@ ALTER TABLE `ospos_sales`
     
 ALTER TABLE `ospos_customers`
     `company_name` varchar(255) DEFAULT NULL;
+
+ALTER TABLE `ospos_giftcards`
+    `person_id` int(10) DEFAULT NULL;
diff --git a/database/database.sql b/database/database.sql
index 08309efca..03366dd13 100644
--- a/database/database.sql
+++ b/database/database.sql
@@ -124,9 +124,10 @@ CREATE TABLE `ospos_giftcards` (
   `giftcard_number` varchar(25) NOT NULL,
   `value` decimal(15,2) NOT NULL,
   `deleted` int(1) NOT NULL DEFAULT '0',
-  `person_id` INT NOT NULL,
+  `person_id` INT(10) DEFAULT NULL,
   PRIMARY KEY (`giftcard_id`),
-  UNIQUE KEY `giftcard_number` (`giftcard_number`)
+  UNIQUE KEY `giftcard_number` (`giftcard_number`),
+  KEY `person_id` (`person_id`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
 
 --
diff --git a/translations/giftcards_lang.csv b/translations/giftcards_lang.csv
index 7b4664931..4d6849725 100644
--- a/translations/giftcards_lang.csv
+++ b/translations/giftcards_lang.csv
@@ -2,6 +2,7 @@ label,nl-BE,es,en,fr,zh,ru,th,tr,id
 giftcards_add_minus,Corrigatie hoeveelheid,Inventario a agregar/substraer,Inventory to add/subtract,Ajout/Soustraction à l\'inventaire,加/減庫存,Инвентарь для сложения/вычитания,Inventory to add/subtract,Inventory to add/subtract,Penyesuaian Inventori TAMBAH / KURANG (-)
 giftcards_allow_alt_description,Aanpasbare omschrijving,Permitir Descripción Alternativa,Allow Alt Description,Autorisér Description Alt,允許使用ALT描述,Разрешить альтернативные Описание,,Allow Alt Description,Deskripsi Alternatif dimungkinkan
 giftcards_amazon,Amazon,Amazon,Amazon,Amazon,Amazon,Amazon,Amazon,Amazon,Amazon
+giftcards_remaining_balance,Resterende waarde cadeaubon %1 is %2!,Giftcard %1 remaining value is %2!,Giftcard %1 remaining value is %2!,Giftcard %1 remaining value is %2!,Giftcard %1 remaining value is %2!,Giftcard %1 remaining value is %2!,Giftcard %1 remaining value is %2!,Giftcard %1 remaining value is %2!,Giftcard %1 remaining value is %2!
 giftcards_basic_information,Cadeaubon Info,Información de Tarjeta de Regalo,Giftcard Information,Détails de la Carte,禮金券資訊,информация Подарочную карту,ข้อมูลบัตรกำนัล,Giftcard Information,Informasi GiftCard
 giftcards_bulk_edit,Bewerk Selectie,Edición Múltiple,Bulk Edit,Édition en groupe,批量編輯,Массовое изменение,Bulk Edit,Bulk Edit,Ubah Massal
 giftcards_cannot_be_deleted,De cadeaubons konden niet worden verwijderd.,No se puede borrar las tarjetas seleccionadas. Una o más tiene ventas.,"Could not deleted selected giftcards, one or more of the selected giftcards has sales.",Impossible de supprimer. Une ou plusieurs carte(s) ont des ventes.,無法刪除選定的禮金券，一個或多個所選擇的禮金券已經使用。,"Не удалось удалить выбранные подарочные карты, одну или несколько из выбранных подарочные карты имеет продаж.","Could not deleted selected giftcards, one or more of the selected giftcards has sales.","Could not deleted selected giftcards, one or more of the selected giftcards has sales.","Tidak dapat menghapus GiftCard terpilih, Satu atau lebih GiftCard yang dipilih memiliki Penjualan."
@@ -44,7 +45,6 @@ giftcards_number_information,Cadeaubon Nummer,Número de Tarjeta de Regalo,Giftc
 giftcards_number_required,Cadeaubon Nummer is een verplicht veld,Número de Tarjeta de Regalo es requerido,Giftcard Number is a required field,Le Numéro est requis,請輸入禮金券編號,Номер Подарочную карту обязательный пробел,ต้องกรอกเลขบัตรกำนัล,Giftcard Number is a required field,Nomor GiftCard wajib diisi
 giftcards_one_or_multiple,cadeaubon(s) verwijderd,tarjeta(s) de regalo,giftcard(s),carte(s),禮金券,подарочную карту,giftcard(s),giftcard(s),GiftCard
 giftcards_person_id,Klant,Customer,Customer,Client,Customer,Клиент,เจ้าของบัตร,Customer,Nomor Pelanggan
-giftcards_customer_required,Klant is een verplicht veld,Giftcard customer is a required field,Giftcard customer is a required field,Giftcard customer is a required field,Giftcard customer is a required field,Giftcard customer is a required field,Giftcard customer is a required field,Giftcard customer is a required field,Giftcard customer is a required field
 giftcards_quantity,In stock,Cantidad,Quantity,Quantité,數量,Количество,ปริมาณ,Quantity,Jumlah
 giftcards_quantity_required,Hoeveelheid moet ingevuld worden. Druk Sluit ( X ) om te annuleren,"Cantidad es requerido. Por favor, haz click en ( X ) para cancelar",Quantity is a required field. Please Close ( X ) to cancel,La quantité est requise. Veuillez Fermer ( X ) pour annuler,數量是必填字段。請按關閉（X）來取消,"Количество является обязательным полем. Пожалуйста, закройте (X), чтобы отменить",Quantity is a required field. Please Close ( X ) to cancel,Quantity is a required field. Please Close ( X ) to cancel,Jumlah wajib diisi. Silahkan tutup ( X ) untuk batal
 giftcards_reorder_level,Reorder Level,Cantidad Mínima,Reorder Level,Seuil de Réapprovisionnement,補貨點,минимальный уровень для перезаказ,ยอดขั้นต่ำ,Reorder Level,Level Pesan Ulang
diff --git a/translations/sales_lang.csv b/translations/sales_lang.csv
index 979386159..6063f22dc 100644
--- a/translations/sales_lang.csv
+++ b/translations/sales_lang.csv
@@ -39,7 +39,7 @@ sales_error_editing_item,Fout bij bewerken,Error editando artículo,Error editin
 sales_find_or_scan_item,Zoek/Scan Product,Encontrar/Escanear Artículo,Find/Scan Item,Trouver/Scanner Item,查找/掃描商品,Найти/Сканировать Товара,ค้นหาสินค้า,Ürün Bul/Oku,Cari/Scan Item
 sales_find_or_scan_item_or_receipt,Zoek/Scan Product of Ticket,Encontrar/Escanear Artículo o Entrada,Find/Scan Item OR Receipt,Trouver/Scanner Item OU Recu,查找/掃描產品或收貨單,Найти/Сканировать Товара ИЛИ Квитанция,ค้นหาสินค้า หรือ บิล,Ürün yada Fatura Bul/Oku,Cari/Scan Item ATAU Faktur
 sales_giftcard,Cadeaubon,Tarjeta de Regalo,Gift Card,Carte Cadeau,禮金券,Подарочная карта,Gift Card,Hediye Çeki,Gift Card
-sales_giftcard_balance,Waardebon Resterend,Giftcard Balance,Giftcard Balance,Giftcard Balance,Giftcard Balance,Giftcard Balance,Giftcard Balance,Giftcard Balance,Giftcard Balance
+sales_giftcard_balance,Cadeaubon Resterend,Giftcard Balance,Giftcard Balance,Giftcard Balance,Giftcard Balance,Giftcard Balance,Giftcard Balance,Giftcard Balance,Giftcard Balance
 sales_giftcard_number,Cadeaubon nummer,Número de Tarjeta de Regalo,Gift Card Number,Numéro de Carte cadeau,禮金券編號,Номер подарочных карт,เลขที่ Gift Card,Hediye Çeki No,Nomor Gift Card
 sales_id,Nummer Verkoop ,ID de Venta,Sale ID,ID Vente,銷售編號,Номер Продажы,เลขที่ขาย,Satış No,ID Penjualan
 sales_invoice,Factuur,tarjeta de Crédito,Invoice,Invoice,Invoice,Invoice,Invoice,Invoice,Invoice