From 4dde3ced96050c3b040cf375e1b165a481a34b1b Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 7 Oct 2011 19:33:31 +0200 Subject: [PATCH] Fix: merge problem --- htdocs/langs/en_GB/bills.lang | 17 ++++++++++++++++- htdocs/langs/en_GB/compta.lang | 3 +++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/htdocs/langs/en_GB/bills.lang b/htdocs/langs/en_GB/bills.lang index 4bccc5d3a55..e35defcb4b8 100644 --- a/htdocs/langs/en_GB/bills.lang +++ b/htdocs/langs/en_GB/bills.lang @@ -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. \ No newline at end of file +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 \ No newline at end of file diff --git a/htdocs/langs/en_GB/compta.lang b/htdocs/langs/en_GB/compta.lang index bee486b9cb4..bb96d93537c 100644 --- a/htdocs/langs/en_GB/compta.lang +++ b/htdocs/langs/en_GB/compta.lang @@ -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 \ No newline at end of file