From 652d715fdc70baee99bd829076438d5efa1c5966 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 13 Jul 2017 18:18:56 +0200 Subject: [PATCH] Better translation --- htdocs/accountancy/journal/bankjournal.php | 2 +- htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 1 + htdocs/langs/en_US/banks.lang | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php index c740459b34c..14307185ac6 100644 --- a/htdocs/accountancy/journal/bankjournal.php +++ b/htdocs/accountancy/journal/bankjournal.php @@ -913,7 +913,7 @@ if (empty($action) || $action == 'view') { if ($resultmid) { $objmid = $db->fetch_object($resultmid); $variousstatic->fetch($objmid->id); - $ref=$variousstatic->getNomUrl(1); + $ref=$langs->trans("VariousPayment").' '.$variousstatic->getNomUrl(1); } else dol_print_error($db); } diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql index 90809090423..89b4f9cd00c 100644 --- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql +++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql @@ -566,5 +566,6 @@ ALTER TABLE llx_blockedlog_authority ADD INDEX signature (signature); UPDATE llx_bank SET label= '(SupplierInvoicePayment)' WHERE label= 'Règlement fournisseur'; UPDATE llx_bank SET label= '(CustomerInvoicePayment)' WHERE label= 'Règlement client'; +UPDATE llx_bank SET label= '(payment_salary)' WHERE label LIKE 'Règlement salaire'; ALTER TABLE llx_mailing_cibles MODIFY COLUMN source_url varchar(255); diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang index 3c7f8b338c0..3f995673f88 100644 --- a/htdocs/langs/en_US/banks.lang +++ b/htdocs/langs/en_US/banks.lang @@ -151,7 +151,7 @@ CheckRejectedAndInvoicesReopened=Check returned and invoices reopened BankAccountModelModule=Document templates for bank accounts DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only. DocumentModelBan=Template to print a page with BAN information. -NewVariousPayment=New various payment -VariousPayment=Various payment -VariousPayments=Various payments -ShowVariousPayment=Show various payment +NewVariousPayment=New miscellaneous payment +VariousPayment=Miscellaneous payment +VariousPayments=Miscellaneous payments +ShowVariousPayment=Show miscellaneous payment