Merge pull request #5381 from grandoc/develop

internationalization of code comment
Dolibarr · Jun 23, 2016 · 0662be0 · 0662be0
2 parents 6cedec2 + cc4fe87
commit 0662be0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2005-2014 Regis Houssin                <regis.houssin@capnetworks.com>
  * Copyright (C) 2008 	   Raphael Bertrand (Resultic)  <raphael.bertrand@resultic.fr>
  * Copyright (C) 2011-2013 Juanjo Menent			    <jmenent@2byte.es>
- * Copyright (C) 2011-2015 Philippe Grand			    <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2016 Philippe Grand			    <philippe.grand@atoo-net.com>
  * Copyright (C) 2013 	   Florian Henry			    <florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -494,7 +494,7 @@
 	                                print "</td>";
 	                            }
 
-	                            // Defaut
+	                            // Default
 	                            print '<td align="center">';
 	                            if ($conf->global->COMMANDE_ADDON_PDF == $name)
 	                            {

diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2014	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2011-2015	Philippe Grand			<philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2016	Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2015       Alexandre Spangaro      <aspangaro.dolibarr@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -399,7 +399,7 @@
 
 	print '<br>';
 
-	// Identifiants de la societe (country-specific)
+	// IDs of the company (country-specific)
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td>'.$langs->trans("CompanyIds").'</td><td>'.$langs->trans("Value").'</td></tr>';
 	$var=true;
@@ -416,7 +416,7 @@
 	print '<tr '.$bc[$var].'><td width="35%"><label for="capital">'.$langs->trans("Capital").'</label></td><td>';
 	print '<input name="capital" id="capital" size="20" value="' . $conf->global->MAIN_INFO_CAPITAL . '"></td></tr>';
 
-	// Forme juridique
+	// Juridical Status
 	$var=!$var;
 	print '<tr '.$bc[$var].'><td><label for="forme_juridique_code">'.$langs->trans("JuridicalStatus").'</label></td><td>';
 	if ($mysoc->country_code) {
@@ -764,7 +764,7 @@
 	print $mysoc->logo;
 	print '</td><td class="nocellnopadd" valign="center" align="right">';
 
-	// On propose la generation de la vignette si elle n'existe pas
+	// It offers the generation of the thumbnail if it does not exist
 	if (!is_file($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini) && preg_match('/(\.jpg|\.jpeg|\.png)$/i',$mysoc->logo))
 	{
 		print '<a href="'.$_SERVER["PHP_SELF"].'?action=addthumb&amp;file='.urlencode($mysoc->logo).'">'.img_picto($langs->trans('GenerateThumb'),'refresh').'</a>&nbsp;&nbsp;';
@@ -790,7 +790,7 @@
 	print '<br>';
 
 
-	// Identifiants de la societe (country-specific)
+	// IDs of the company (country-specific)
 	print '<form name="formsoc" method="post">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<table class="noborder" width="100%">';
@@ -807,7 +807,7 @@
 	print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("Capital").'</td><td>';
 	print $conf->global->MAIN_INFO_CAPITAL . '</td></tr>';
 
-	// Forme juridique
+	// Juridical Status
 	$var=!$var;
 	print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("JuridicalStatus").'</td><td>';
 	print getFormeJuridiqueLabel($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE);
@@ -898,7 +898,7 @@
 		print '</td></tr>';
 	}
 
-	// TVA
+	// VAT
 	$var=!$var;
 	print '<tr '.$bc[$var].'><td>'.$langs->trans("VATIntra").'</td>';
 	print '<td>';
@@ -943,7 +943,7 @@
 	print '</form>';
 
 	/*
-	 *  Debut d'annee fiscale
+	 *  fiscal year beginning
 	 */
 	print '<br>';
 	print '<table class="noborder" width="100%">';
@@ -960,7 +960,7 @@
 	print "</table>";
 
 	/*
-	 *  Options fiscale
+	 *  tax options
 	 */
 	print '<br>';
 	print '<table class="noborder" width="100%">';

diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2011-2013 Juanjo Menent	    <jmenent@2byte.es>
- * Copyright (C) 2013-2015 Philippe Grand	    <philippe.grand@atoo-net.com>
+ * Copyright (C) 2013-2016 Philippe Grand	    <philippe.grand@atoo-net.com>
  * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -114,7 +114,7 @@
 
 print '<table class="noborder" width="100%">';
 
-// Cas du parametre ACCOUNTING_MODE
+// case of the parameter ACCOUNTING_MODE
 
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans('OptionMode').'</td><td>'.$langs->trans('Description').'</td>';