Fix: merge problem

This commit is contained in:
Regis Houssin 2011-10-07 19:33:31 +02:00
parent 74bf80a74a
commit 4dde3ced96
2 changed files with 19 additions and 1 deletions

View File

@ -1,3 +1,18 @@
# Dolibarr language file - en_GB - main
CHARSET=UTF-8
PrettyLittleSentence=Accept the amount of payments due by cheques issued in my name as a Member of an accounting association approved by the Fiscal Administration.
PrettyLittleSentence=Accept the amount of payments due by cheques issued in my name as a Member of an accounting association approved by the Fiscal Administration.
PaymentTypeCHQ=Cheque
PaymentTypeShortCHQ=Cheque
ChequeNumber=Cheque N°
ChequeOrTransferNumber=Cheque/Transfer N°
ChequeMaker=Cheque transmitter
ChequeBank=Bank of Cheque
PaymentByChequeOrderedTo=Cheque payment (including tax) are payable to %s send to
PaymentByChequeOrderedToShort=Cheque payment (including tax) are payable to
MenuChequeDeposits=Cheques deposits
MenuCheques=Cheques
MenuChequesReceipts=Cheques receipts
ChequesReceipts=Cheques receipts
ChequesArea=Cheques deposits area
ChequeDeposits=Cheques deposits
Cheques=Cheques

View File

@ -1,5 +1,8 @@
# Dolibarr language file - en_GB - main
CHARSET=UTF-8
CheckReceipt=Cheque deposit
CheckReceiptShort=Cheque deposit
NewCheckDeposit=New cheque deposit
NoWaitingChecks=No cheques waiting for deposit.
DateChequeReceived=Cheque reception date
NbOfCheques=Nb of cheques