diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index af5c1b60a41..7d51540f994 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -19,4 +19,5 @@ ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
 ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
-ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
\ No newline at end of file
+ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
+ErrorGenbarCodeNotfound=File not found (Bad path, wrong permissions or access denied by openbasedir parameter) 
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 1ead8d455fe..adbb3c620cb 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -88,6 +88,7 @@ BarCode=Barcode
 BarcodeType=Barcode type
 SetDefaultBarcodeType=Set barcode type
 BarcodeValue=Barcode value
+GenbarcodeLocation=Bar code generation command line tool (used by phpbarcode engine for some bar code types)
 NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
 CreateCopy=Create copy
 ServiceLimitedDuration=If product is a service with limited duration:
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 633fdbe0b2a..2166c4ed6ec 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -19,4 +19,5 @@ ErrorFailedToCreateDir=Echec a la creation d'un repertoire. Verifiez que le user
 ErrorNoMailDefinedForThisUser=EMail non defini pour cet utilisateur
 ErrorFeatureNeedJavascript=Cette fonctionnalité a besoin de javascript activé pour fonctionner. Modifier dans configuration - affichage.
 ErrorTopMenuMustHaveAParentWithId0=Un menu de type 'Top' ne peut avoir de menu père. Mettre 0 dans l'id père ou choisir un menu de type 'Left'.
-ErrorLeftMenuMustHaveAParentId=Un menu de type 'Left' doit avoir un id de père.
\ No newline at end of file
+ErrorLeftMenuMustHaveAParentId=Un menu de type 'Left' doit avoir un id de père.
+ErrorGenbarCodeNotfound=Fichier introuvable (Mauvais chemin, permissions incorrectes ou accès interdit par le paramètre openbasedir) 
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index b9446d760c2..e418c69c07b 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -86,6 +86,7 @@ PriceRemoved=Prix supprim
 BarCode=Code barre
 BarcodeType=Type de code barre
 BarcodeValue=Valeur du code barre
+GenbarcodeLocation=Outil generation code barre en ligne de commande (utilisé par le moteur phpbarcode pour certains type de codes barre)
 SetDefaultBarcodeType=Définissez le type de code barre
 NoteNotVisibleOnBill=Note (non visible sur les factures, propals...)
 CreateCopy=Créer copie
diff --git a/htdocs/product/barcode.php b/htdocs/product/barcode.php
index 4b6bf45a13b..1a247065f40 100644
--- a/htdocs/product/barcode.php
+++ b/htdocs/product/barcode.php
@@ -16,15 +16,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
  */
 
 /**
         \file       htdocs/product/barcode.php
         \ingroup    product
         \brief      Page du code barre
-        \version    $Revision$
+        \version    $Id$
 */
 
 require("./pre.inc.php");
@@ -60,7 +58,7 @@ if ($_POST['action'] ==	'setbarcode'	&& $user->rights->barcode->creer)
 {
   $product =	new	Product($db);
   $product->fetch($_GET["id"]);
-  $product->barcode = $_POST['barcode']; //Todo: ajout vérification de la validité du code barre en fonction du type
+  $product->barcode = $_POST['barcode']; //Todo: ajout v�rification de la validit� du code barre en fonction du type
   $result = $product->update_barcode($user);
   Header("Location: barcode.php?id=".$_GET["id"]);
   exit;
@@ -137,14 +135,14 @@ if ($_GET['action'] == 'editbarcodetype')
 }
 else
 {
-	print $product->barcode_type_label?$product->barcode_type_label:'<div class="warning">'.$langs->trans("SetDefaultBarcodeTypeInConfigurationModule").'<div>';
+	print $product->barcode_type_label?$product->barcode_type_label:'<div class="warning">'.$langs->trans("SetDefaultBarcodeType").'<div>';
 }
 print '</td></tr>';
 
-// Barcode	 
+// Barcode value
 print '<tr><td nowrap>';
 print '<table width="100%" class="nobordernopadding"><tr><td nowrap>';
-print $langs->trans("Barcode");
+print $langs->trans("BarcodeValue");
 print '<td>';
 if (($_GET['action'] != 'editbarcode') && $user->rights->barcode->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbarcode&amp;id='.$product->id.'">'.img_edit($langs->trans('SetBarcode'),1).'</a></td>';
 print '</tr></table>';