Doxygen

Bad translation
Dolibarr · Dec 13, 2013 · 9a07f31 · 9a07f31
1 parent 92d23b2
commit 9a07f31
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
@@ -777,7 +777,7 @@ function dol_strftime($fmt, $ts=false, $is_gmt=false)
  * 	Return charset is always UTF-8, except if encodetoouput is defined. In this case charset is output charset
  *
  *	@param	int			$time			GM Timestamps date
- *	@param	string		$format      	Output date format
+ *	@param	string		$format      	Output date format (tag of strftime function)
  *										"%d %b %Y",
  *										"%d/%m/%Y %H:%M",
  *										"%d/%m/%Y %H:%M:%S",

diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
@@ -30,7 +30,7 @@ Profit=Profit
 Balance=Balance
 Debit=Debit
 Credit=Credit
-Piece=Voucher
+Piece=Accounting Doc. 
 Withdrawal=Withdrawal
 Withdrawals=Withdrawals
 AmountHTVATRealReceived=Net collected
@@ -168,11 +168,11 @@ CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is
 CalculationRuleDescSupplier=according to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
-COMPTA_PRODUCT_BUY_ACCOUNT=Code comptable par défaut des achats de marchandises
-COMPTA_PRODUCT_SOLD_ACCOUNT=Code comptable par défaut des ventes de marchandises
-COMPTA_SERVICE_BUY_ACCOUNT=Code comptable par défaut des achats de services
-COMPTA_SERVICE_SOLD_ACCOUNT=Code comptable par défaut des ventes de services
-COMPTA_VAT_ACCOUNT=Code comptable par défaut de la TVA collectée
-COMPTA_VAT_BUY_ACCOUNT=Code comptable par défaut de la TVA déductible
+COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products
+COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products
+COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services
+COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services
+COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT
+COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
 COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
 COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties