lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.7' into develop

Browse Source 
Conflicts:
	htdocs/langs/en_GB/main.lang
	htdocs/langs/es_CO/salaries.lang
This commit is contained in:
Laurent Destailleur 2015-04-02 14:04:04 +02:00
commit 805c73b849
10 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/langs/en_GB/banks.lang
View File

@ -1,10 +1,2 @@
# Dolibarr language file - Source file is en_US - banks
ValidateCheckReceipt=Validate this cheque receipt ?
ConfirmValidateCheckReceipt=Are you sure you want to validate this cheque receipt, no change will be possible once this is done ?
DeleteCheckReceipt=Delete this cheque receipt ?
ConfirmDeleteCheckReceipt=Are you sure you want to delete this cheque receipt ?
BankChecks=Bank cheques
BankChecksToReceipt=Cheques waiting for deposit
ShowCheckReceipt=Show cheque deposit receipt
NumberOfCheques=Nb of cheque
SelectChequeTransactionAndGenerate=Select/filter cheques to include into the cheque deposit receipt and click on "Create".
InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD

7
htdocs/langs/en_GB/compta.lang
View File

@ -1,7 +0,0 @@
# Dolibarr language file - Source file is en_US - compta
CheckReceipt=Cheque deposit
CheckReceiptShort=Cheque deposit
NewCheckDeposit=New cheque deposit
NoWaitingChecks=No cheques waiting for deposit.
DateChequeReceived=Cheque reception date
NbOfCheques=Nb of cheques

18
htdocs/langs/en_GB/main.lang
View File

@ -13,9 +13,15 @@ FormatDateShortJQueryInput=dd/mm/yy
FormatHourShortJQuery=HH:MI
FormatHourShort=%H:%M
FormatHourShortDuration=%H:%M
FormatDateTextShort=%b %d, %Y
FormatDateText=%B %d, %Y
FormatDateHourShort=%m/%d/%Y %I:%M %p
FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
FormatDateHourTextShort=%b %d, %Y, %I:%M %p
FormatDateHourText=%B %d, %Y, %I:%M %p
FormatDateTextShort=%d %b %Y
FormatDateText=%d %B %Y
FormatDateHourShort=%d/%m/%Y %H:%M
FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
FormatDateHourTextShort=%d %b %Y %H:%M
FormatDateHourText=%d %B %Y %H:%M
AmountVAT=Amount VAT
TotalVAT=Total VAT
IncludedVAT=Included VAT
TTC=Inc. VAT
VAT=VAT
VATRate=VAT Rate

2
htdocs/langs/es_AR/banks.lang Normal file
View File

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - banks
InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD

2
htdocs/langs/es_AR/commercial.lang Normal file
View File

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - commercial
ActionAffectedTo=Event assigned to

2
htdocs/langs/es_AR/suppliers.lang Normal file
View File

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - suppliers
DenyingThisOrder=Deny this order

2
htdocs/langs/es_CO/banks.lang Normal file
View File

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - banks
InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD

2
htdocs/langs/es_CO/commercial.lang Normal file
View File

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - commercial
ActionAffectedTo=Event assigned to

2
htdocs/langs/es_CO/salaries.lang
View File

@ -3,4 +3,4 @@ SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Código contable para pagos de salarios
SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Código contable para cargo financiero
THM=Valor de hora promedio
TJM=Valor día promedio
CurrentSalary=Salario actual
CurrentSalary=Salario actual

2
htdocs/langs/es_CO/suppliers.lang Normal file
View File

@ -0,0 +1,2 @@
# Dolibarr language file - Source file is en_US - suppliers
DenyingThisOrder=Deny this order