From 0501491475bd8bf64eafbc503d68422ad1fd1f68 Mon Sep 17 00:00:00 2001 From: hameau Date: Mon, 18 Nov 2013 17:45:19 +0100 Subject: [PATCH 1/4] Update printipp.lang Minor typos; minor translation fr->en. --- htdocs/langs/en_US/printipp.lang | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/langs/en_US/printipp.lang b/htdocs/langs/en_US/printipp.lang index 9df63bd9961f6..cc719fddded0c 100644 --- a/htdocs/langs/en_US/printipp.lang +++ b/htdocs/langs/en_US/printipp.lang @@ -1,9 +1,9 @@ # Dolibarr language file - Source file is en_US - printipp -PrintIPPSetup=Setup of module Direct Print -PrintIPPDesc=Ce module permet d'ajouter un bouton d'impression direct des documents vers votre imprimante. Il requiert un systeme Linux équipé de Cups. -PRINTIPP_ENABLED=Show picto "Direct print" into list of documents +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists PRINTIPP_HOST=Print server PRINTIPP_PORT=Port PRINTIPP_USER=Login PRINTIPP_PASSWORD=Password -NoPrinterFound=No printers found (check your Cups etup) +NoPrinterFound=No printers found (check your CUPS setup) From c04d454d4f1b4bad724a2eb5c8ede0fb9eac6242 Mon Sep 17 00:00:00 2001 From: hameau Date: Mon, 18 Nov 2013 18:05:36 +0100 Subject: [PATCH 2/4] Update withdrawals.lang Minor typos. --- htdocs/langs/en_US/withdrawals.lang | 32 ++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang index 2d1ba3584c397..91d4a473d6e73 100644 --- a/htdocs/langs/en_US/withdrawals.lang +++ b/htdocs/langs/en_US/withdrawals.lang @@ -18,8 +18,8 @@ RequestStandingOrderToTreat=Request for standing orders to treat RequestStandingOrderTreated=Request for standing orders treated CustomersStandingOrders=Customer standing orders CustomerStandingOrder=Customer standing order -NbOfInvoiceToWithdraw=Nb of invoice with withdraw request -NbOfInvoiceToWithdrawWithInfo=Nb of invoice with withdraw request for customers having defined bank account information +NbOfInvoiceToWithdraw=No. of invoice with withdraw request +NbOfInvoiceToWithdrawWithInfo=No. of invoice with withdraw request for customers having defined bank account information InvoiceWaitingWithdraw=Invoice waiting for withdraw AmountToWithdraw=Amount to withdraw WithdrawsRefused=Withdraws refused @@ -34,14 +34,14 @@ ThirdPartyBankCode=Third party bank code ThirdPartyDeskCode=Third party desk code NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN. ClassCredited=Classify credited -ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account ? -TransData=Date Transmission -TransMetod=Method Transmission +ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account? +TransData=Transmission date +TransMetod=Transmission method Send=Send Lines=Lines -StandingOrderReject=Issue a reject +StandingOrderReject=Issue a rejection InvoiceRefused=Invoice refused -WithdrawalRefused=Withdrawal Refused +WithdrawalRefused=Withdrawal refused WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society RefusedData=Date of rejection RefusedReason=Reason for rejection @@ -51,15 +51,15 @@ InvoiceRefused=Charge the rejection to customer Status=Status StatusUnknown=Unknown StatusWaiting=Waiting -StatusTrans=Transmitted +StatusTrans=Sent StatusCredited=Credited StatusRefused=Refused StatusMotif0=Unspecified -StatusMotif1=Provision insuffisante -StatusMotif2=Tirage conteste +StatusMotif1=Insufficient funds +StatusMotif2=Request contested StatusMotif3=No Withdrawal order StatusMotif4=Customer Order -StatusMotif5=RIB inexploitable +StatusMotif5=RIB unusable StatusMotif6=Account without balance StatusMotif7=Judicial Decision StatusMotif8=Other reason @@ -78,18 +78,18 @@ BankToReceiveWithdraw=Bank account to receive withdraws CreditDate=Credit on WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country ShowWithdraw=Show Withdraw -IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as payed to allow to manage withdrawal before. -DoStandingOrdersBeforePayments=This tabs allows you to request for a standing order. Once it will be finished, you can type the payment to close the invoice. +IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice. WithdrawalFile=Withdrawal file SetToStatusSent=Set to status "File Sent" -ThisWillAlsoAddPaymentOnInvoice=This will also create payments onto invoices and will classify them to paid +ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" ### Notifications InfoCreditSubject=Payment of standing order %s by the bank InfoCreditMessage=The standing order %s has been paid by the bank
Data of payment: %s InfoTransSubject=Transmission of standing order %s to bank -InfoTransMessage=The standing order %s has been transmited to bank by %s %s.

-InfoTransData=Amount: %s
Metode: %s
Date: %s +InfoTransMessage=The standing order %s has been sent to bank by %s %s.

+InfoTransData=Amount: %s
Method: %s
Date: %s InfoFoot=This is an automated message sent by Dolibarr InfoRejectSubject=Standing order refused InfoRejectMessage=Hello,

the standing order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.

--
%s From a94fb12e5e6e8b213b18f42f8a70b06ee1b1c35e Mon Sep 17 00:00:00 2001 From: hameau Date: Mon, 18 Nov 2013 18:07:17 +0100 Subject: [PATCH 3/4] Update other.lang Minor typo --- htdocs/langs/en_US/other.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang index c6a72ec672abe..76acd7022fc14 100644 --- a/htdocs/langs/en_US/other.lang +++ b/htdocs/langs/en_US/other.lang @@ -6,7 +6,7 @@ Tools=Tools ToolsDesc=This area is dedicated to group miscellaneous tools not available into other menu entries.

Those tools can be reached from menu on the side. Birthday=Birthday BirthdayDate=Birthday -DateToBirth=Date to birth +DateToBirth=Date of birth BirthdayAlertOn= birthday alert active BirthdayAlertOff= birthday alert inactive Notify_FICHINTER_VALIDATE=Intervention validated From 9d2dee207a5e87433a93e9e7c98f2008607da60b Mon Sep 17 00:00:00 2001 From: hameau Date: Mon, 18 Nov 2013 18:13:34 +0100 Subject: [PATCH 4/4] Update bills.lang Minor typos --- htdocs/langs/en_US/bills.lang | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 0903f98a3019f..e03b31c1929a6 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -383,13 +383,13 @@ PaymentInvoiceRef=Payment invoice %s ValidateInvoice=Validate invoice Cash=Cash Reported=Delayed -DisabledBecausePayments=Not possible since there is some payments -CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified payed +DisabledBecausePayments=Not possible since there are some payments +CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid ExpectedToPay=Expected payment -PayedByThisPayment=Payed by this payment -ClosePaidInvoicesAutomatically=Classify "Payed" all standard or replacement invoices entirely payed. -ClosePaidCreditNotesAutomatically=Classify "Payed" all credit notes entirely paid back. -AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Payed". +PayedByThisPayment=Paid by this payment +ClosePaidInvoicesAutomatically=Classify "Paid" all standard or replacement invoices entirely paid. +ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back. +AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid". ToMakePayment=Pay ToMakePaymentBack=Pay back ListOfYourUnpaidInvoices=List of unpaid invoices @@ -405,11 +405,11 @@ TypeContact_invoice_supplier_external_BILLING=Supplier invoice contact TypeContact_invoice_supplier_external_SHIPPING=Supplier shipping contact TypeContact_invoice_supplier_external_SERVICE=Supplier service contact # crabe PDF Model -PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (Template recommanded) +PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template) # oursin PDF Model -PDFOursinDescription=Invoice PDF template Oursin. A complete invoice template (Template alternative) +PDFOursinDescription=Invoice PDF template Oursin. A complete invoice template (alternative Template) # NumRef Modules -TerreNumRefModelDesc1=Return numero with format %syymm-nnnn for standard and replacement invoices, %syymm-nnnn for credit notes and %syymm-nnnn for deposits where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 -MarsNumRefModelDesc1=Return numero with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for credit notes and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 +TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 +MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for credit notes and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.