Merge pull request #1440 from grandoc/develop

anglicized
Dolibarr · Feb 27, 2014 · 8f0e96f · 8f0e96f
2 parents a453d24 + 5c4ceb1
commit 8f0e96f
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 deletions.
diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php
@@ -28,7 +28,7 @@
 $langs->load("members");
 $langs->load("errors");
 
-// Choix de l'annee d'impression ou annee courante.
+// Choice of print year or current year.
 $now = dol_now();
 $year=dol_print_date($now,'%Y');
 $month=dol_print_date($now,'%m');

diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php
@@ -32,7 +32,7 @@
 $langs->load("members");
 $langs->load("errors");
 
-// Choix de l'annee d'impression ou annee courante.
+// Choice of print year or current year.
 $now = dol_now();
 $year=dol_print_date($now,'%Y');
 $month=dol_print_date($now,'%m');
@@ -57,7 +57,7 @@
 
 if (GETPOST('submitproduct') && GETPOST('submitproduct'))
 {
-	$action='';	// We reset because we dont want to build doc
+	$action='';	// We reset because we don't want to build doc
 	if (GETPOST('productid') > 0)
 	{
 		$producttmp->fetch(GETPOST('productid'));
@@ -74,7 +74,7 @@
 }
 if (GETPOST('submitthirdparty') && GETPOST('submitthirdparty'))
 {
-	$action='';	// We reset because we dont want to build doc
+	$action='';	// We reset because we don't want to build doc
 	if (GETPOST('socid') > 0)
 	{
 		$thirdpartytmp->fetch(GETPOST('socid'));

diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
@@ -33,17 +33,17 @@
  */
 class mod_barcode_product_standard extends ModeleNumRefBarCode
 {
-	var $nom='Standard';				// Nom du modele
-	var $code_modifiable;				// Code modifiable
-	var $code_modifiable_invalide;		// Code modifiable si il est invalide
-	var $code_modifiable_null;			// Code modifiables si il est null
-	var $code_null;						// Code facultatif
+	var $nom='Standard';				// Model Name
+	var $code_modifiable;				// Editable code
+	var $code_modifiable_invalide;		// Modified code if it is invalid
+	var $code_modifiable_null;			// Modified code if it is null
+	var $code_null;						// Optional code
 	var $version='dolibarr';    		// 'development', 'experimental', 'dolibarr'
-	var $code_auto;                     // Numerotation automatique
+	var $code_auto;                     // Automatic Numbering
 
-	var $searchcode; // String de recherche
-	var $numbitcounter; // Nombre de chiffres du compteur
-	var $prefixIsRequired; // Le champ prefix du tiers doit etre renseigne quand on utilise {pre}
+	var $searchcode; // Search string
+	var $numbitcounter; // Number of digits the counter
+	var $prefixIsRequired; // The prefix field of third party must be filled when using {pre}
 
 
 	/**

diff --git a/htdocs/core/modules/barcode/modules_barcode.class.php b/htdocs/core/modules/barcode/modules_barcode.class.php
@@ -25,17 +25,17 @@
 
 
 /**
- *	Parent class for barcode document modules
+ *	Parent class for barcode document models
  */
 abstract class ModeleBarCode
 {
 	var $error='';
 
 
 	/**
-	 * Return if a module can be used or not
+	 * Return if a model can be used or not
 	 *
-	 * @return		boolean     true if module can be used
+	 * @return		boolean     true if model can be used
 	 */
 	function isEnabled()
 	{
@@ -46,34 +46,34 @@ function isEnabled()
 
 
 /**
- *	Parent class for barcode numbering modules
+ *	Parent class for barcode numbering models
  */
 abstract class ModeleNumRefBarCode
 {
 	var $error='';
 
-    /**     Renvoi la description par defaut du modele de numerotation
+    /**     Return default description of numbering model
      *
      *		@param	Translate	$langs		Object langs
-     *      @return string      			Texte descripif
+     *      @return string      			Descriptive text
      */
     function info($langs)
     {
         $langs->load("bills");
         return $langs->trans("NoDescription");
     }
 
-    /**     Renvoi nom module
+    /**     Return model name
      *
      *		@param	Translate	$langs		Object langs
-     *      @return string      			Nom du module
+     *      @return string      			Model name
      */
     function getNom($langs)
     {
         return $this->nom;
     }
 
-    /**     Renvoi un exemple de numerotation
+    /**     Return a numbering example 
      *
      *		@param	Translate	$langs		Object langs
      *      @return string      			Example