diff --git a/application/controllers/config.php b/application/controllers/config.php
index 913b1e1d4..65c539c08 100644
--- a/application/controllers/config.php
+++ b/application/controllers/config.php
@@ -41,7 +41,7 @@ class Config extends Secure_area
         'tax_included'=>$this->input->post('tax_included'),
 		'recv_invoice_format'=>$this->input->post('recv_invoice_format'),
 		'sales_invoice_format'=>$this->input->post('sales_invoice_format'),
-		'barcode_text'=>$this->input->post('barcode_text'),
+		'barcode_content'=>$this->input->post('barcode_content'),
 		'custom1_name'=>$this->input->post('custom1_name'),/**GARRISON ADDED 4/20/2013**/
 		'custom2_name'=>$this->input->post('custom2_name'),/**GARRISON ADDED 4/20/2013**/
 		'custom3_name'=>$this->input->post('custom3_name'),/**GARRISON ADDED 4/20/2013**/
diff --git a/application/language/en/config_lang.php b/application/language/en/config_lang.php
index 711549904..028beed5a 100644
--- a/application/language/en/config_lang.php
+++ b/application/language/en/config_lang.php
@@ -41,5 +41,5 @@ $lang["config_tax_included"] = "Tax Included";
 $lang["config_timezone"] = "Timezone";
 $lang["config_website"] = "Website";
 $lang["config_barcode_number"] = "UPC/EAN/ISBN";
-$lang["config_barcode_name"] = "Item Name";
-$lang["config_barcode_text"] = "Barcode Content";
+$lang["config_barcode_id"] = "Item Id/Name";
+$lang["config_barcode_content"] = "Barcode Content";
diff --git a/application/language/es/config_lang.php b/application/language/es/config_lang.php
index 3cf990da6..40a378629 100644
--- a/application/language/es/config_lang.php
+++ b/application/language/es/config_lang.php
@@ -41,5 +41,5 @@ $lang["config_tax_included"] = "Impuestos incluidos";
 $lang["config_timezone"] = "Zona Horaria";
 $lang["config_website"] = "Sitio Web";
 $lang["config_barcode_number"] = "UPC/EAN/ISBN";
-$lang["config_barcode_name"] = "";
-$lang["config_barcode_text"] = "";
+$lang["config_barcode_id"] = "Item Id/Name";
+$lang["config_barcode_content"] = "Barcode Content";
diff --git a/application/language/fr/config_lang.php b/application/language/fr/config_lang.php
index 96d44aef3..5c810af19 100644
--- a/application/language/fr/config_lang.php
+++ b/application/language/fr/config_lang.php
@@ -41,5 +41,5 @@ $lang["config_tax_included"] = "";
 $lang["config_timezone"] = "Fuseau Horaire";
 $lang["config_website"] = "Site-web";
 $lang["config_barcode_number"] = "UPC/EAN/ISBN";
-$lang["config_barcode_name"] = "";
-$lang["config_barcode_text"] = "";
+$lang["config_barcode_id"] = "Item Id/Name";
+$lang["config_barcode_content"] = "Barcode Content";
diff --git a/application/language/id/config_lang.php b/application/language/id/config_lang.php
index 3a4966164..9a5bb1ab0 100644
--- a/application/language/id/config_lang.php
+++ b/application/language/id/config_lang.php
@@ -41,5 +41,5 @@ $lang["config_tax_included"] = "Dikenakan Pajak";
 $lang["config_timezone"] = "Zona Waktu";
 $lang["config_website"] = "Situs Perusahaan";
 $lang["config_barcode_number"] = "UPC/EAN/ISBN";
-$lang["config_barcode_name"] = "";
-$lang["config_barcode_text"] = "";
+$lang["config_barcode_id"] = "Item Id/Name";
+$lang["config_barcode_content"] = "Barcode Content";
diff --git a/application/language/nl-BE/config_lang.php b/application/language/nl-BE/config_lang.php
index f980888d3..eb6127329 100755
--- a/application/language/nl-BE/config_lang.php
+++ b/application/language/nl-BE/config_lang.php
@@ -41,5 +41,5 @@ $lang["config_tax_included"] = "VAT Ingebgrepen";
 $lang["config_timezone"] = "Tijdzone";
 $lang["config_website"] = "Website";
 $lang["config_barcode_number"] = "UPC/EAN/ISBN";
-$lang["config_barcode_name"] = "Productnaam";
-$lang["config_barcode_text"] = "Inhoud Barcode";
+$lang["config_barcode_id"] = "Product id/naam";
+$lang["config_barcode_content"] = "Inhoud Barcode";
diff --git a/application/language/ru/config_lang.php b/application/language/ru/config_lang.php
index d0e1919d6..17d355240 100644
--- a/application/language/ru/config_lang.php
+++ b/application/language/ru/config_lang.php
@@ -41,5 +41,5 @@ $lang["config_tax_included"] = "Tax Included";
 $lang["config_timezone"] = "Часовой пояс";
 $lang["config_website"] = "Веб-сайт";
 $lang["config_barcode_number"] = "UPC/EAN/ISBN";
-$lang["config_barcode_name"] = "";
-$lang["config_barcode_text"] = "";
+$lang["config_barcode_id"] = "Item Id/Name";
+$lang["config_barcode_content"] = "Barcode Content";
diff --git a/application/language/th/config_lang.php b/application/language/th/config_lang.php
index 37f2c9c91..497f2d3d8 100644
--- a/application/language/th/config_lang.php
+++ b/application/language/th/config_lang.php
@@ -41,5 +41,5 @@ $lang["config_tax_included"] = "รวมภาษีแล้ว";
 $lang["config_timezone"] = "โซนเวลา";
 $lang["config_website"] = "เว็บไซต์";
 $lang["config_barcode_number"] = "UPC/EAN/ISBN";
-$lang["config_barcode_name"] = "";
-$lang["config_barcode_text"] = "";
+$lang["config_barcode_id"] = "Item Id/Name";
+$lang["config_barcode_content"] = "Barcode Content";
diff --git a/application/language/tr/config_lang.php b/application/language/tr/config_lang.php
index 9f60d3477..72e712367 100644
--- a/application/language/tr/config_lang.php
+++ b/application/language/tr/config_lang.php
@@ -41,5 +41,5 @@ $lang["config_tax_included"] = "";
 $lang["config_timezone"] = "Saat Dilimi";
 $lang["config_website"] = "Website";
 $lang["config_barcode_number"] = "UPC/EAN/ISBN";
-$lang["config_barcode_name"] = "";
-$lang["config_barcode_text"] = "";
+$lang["config_barcode_id"] = "Item Id/Name";
+$lang["config_barcode_content"] = "Barcode Content";
diff --git a/application/language/zh/config_lang.php b/application/language/zh/config_lang.php
index c033452ad..53e6f673c 100755
--- a/application/language/zh/config_lang.php
+++ b/application/language/zh/config_lang.php
@@ -41,5 +41,5 @@ $lang["config_tax_included"] = "Tax Included";
 $lang["config_timezone"] = "時區";
 $lang["config_website"] = "網站";
 $lang["config_barcode_number"] = "UPC/EAN/ISBN";
-$lang["config_barcode_name"] = "";
-$lang["config_barcode_text"] = "";
+$lang["config_barcode_id"] = "Item Id/Name";
+$lang["config_barcode_content"] = "Barcode Content";
diff --git a/application/views/barcode_sheet.php b/application/views/barcode_sheet.php
index 1b79c632d..7fd4b14df 100644
--- a/application/views/barcode_sheet.php
+++ b/application/views/barcode_sheet.php
@@ -11,8 +11,8 @@
 $count = 0;
 foreach($items as $item)
 {
-	$barcode = $item['id'];
-	$text = $this->config->item('barcode_text') === "name" ? $item['name'] : $item['item_number'];
+	$barcode = $this->config->item('barcode_content') === "id" ? $item['id'] : $item['item_number'];
+	$text = $this->config->item('barcode_content') === "id" ? $item['name'] : $item['item_number'];
 	
 	if ($count % 2 ==0 and $count!=0)
 	{
diff --git a/application/views/config.php b/application/views/config.php
index 05b2de742..314fd6811 100644
--- a/application/views/config.php
+++ b/application/views/config.php
@@ -290,19 +290,19 @@ echo form_open('config/save/',array('id'=>'config_form'));
 </div>
 
 <div class="field_row clearfix">    
-<?php echo form_label($this->lang->line('config_barcode_text').':', 'barcode_text',array('class'=>'wide')); ?>
+<?php echo form_label($this->lang->line('config_barcode_content').':', 'barcode_content',array('class'=>'wide')); ?>
     <div class='form_field'>
     <?php echo form_radio(array(
-				'name'=>'barcode_text',
+				'name'=>'barcode_content',
 				'type'=>'radio',
-				'value'=>'name',
-				'checked'=>$this->config->item('barcode_text') === "name")); ?>
-	<?php echo $this->lang->line('config_barcode_name'); ?>
+				'value'=>'id',
+				'checked'=>$this->config->item('barcode_content') === "id")); ?>
+	<?php echo $this->lang->line('config_barcode_id'); ?>
     <?php echo form_radio(array(
-				'name'=>'barcode_text',
+				'name'=>'barcode_content',
 				'type'=>'radio',
 				'value'=>'number',
-				'checked'=>$this->config->item('barcode_text') === "number")); ?>
+				'checked'=>$this->config->item('barcode_content') === "number")); ?>
 	<?php echo $this->lang->line('config_barcode_number'); ?>
     </div>
 </div>
diff --git a/database/2.3_to_2.3.1.sql b/database/2.3_to_2.3.1.sql
index 57c58d5a1..d84291c11 100644
--- a/database/2.3_to_2.3.1.sql
+++ b/database/2.3_to_2.3.1.sql
@@ -79,7 +79,7 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
 ('tax_included', '0'),
 ('recv_invoice_format', '$CO'),
 ('sales_invoice_format', '$CO'),
-('barcode_content', 'name');
+('barcode_content', 'id');
 
 -- add invoice_number column to receivings table
 ALTER TABLE `ospos_receivings` 
diff --git a/database/database.sql b/database/database.sql
index d5b40ef47..c28907baf 100644
--- a/database/database.sql
+++ b/database/database.sql
@@ -40,7 +40,7 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
 ('recv_invoice_format', '$CO'),
 ('sales_invoice_format', '$CO'),
 ('tax_included', '0'),
-('barcode_content', 'name');
+('barcode_content', 'id');
 
 
 -- --------------------------------------------------------
diff --git a/translations/.~lock.config_lang.csv# b/translations/.~lock.config_lang.csv#
new file mode 100644
index 000000000..14175dca6
--- /dev/null
+++ b/translations/.~lock.config_lang.csv#
@@ -0,0 +1 @@
+jekkos ,jekkos,lenovo-t520.home,22.01.2015 23:34,file:///home/jekkos/.config/libreoffice/3;
\ No newline at end of file
diff --git a/translations/config_lang.csv b/translations/config_lang.csv
index 13db26b77..c14791617 100644
--- a/translations/config_lang.csv
+++ b/translations/config_lang.csv
@@ -40,5 +40,5 @@ config_tax_included,VAT Ingebgrepen,Impuestos incluidos,Tax Included,,Tax Includ
 config_timezone,Tijdzone,Zona Horaria,Timezone,Fuseau Horaire,時區,Часовой пояс,โซนเวลา,Saat Dilimi,Zona Waktu
 config_website,Website,Sitio Web,Website,Site-web,網站,Веб-сайт,เว็บไซต์,Website,Situs Perusahaan
 config_barcode_number,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN,UPC/EAN/ISBN
-config_barcode_name,Productnaam,,Item Name,,,,,,
-config_barcode_text,Inhoud Barcode,,Barcode Content,,,,,,
+config_barcode_id,Product id/naam,Item Id/Name,Item Id/Name,Item Id/Name,Item Id/Name,Item Id/Name,Item Id/Name,Item Id/Name,Item Id/Name
+config_barcode_content,Inhoud Barcode,Barcode Content,Barcode Content,Barcode Content,Barcode Content,Barcode Content,Barcode Content,Barcode Content,Barcode Content