From 704699f9a11197182ddf673ac44e3bf3f7fb9d57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Wed, 26 Mar 2014 16:26:29 +0100 Subject: [PATCH 01/13] Action triggers: added missing triggers to the data dictionnary These triggers were programmed in htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php but were nowhere to be found in the interface because they didn't hit the database. --- htdocs/install/mysql/data/llx_c_action_trigger.sql | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql index cd7f1fc285d..7addf0aaf8a 100644 --- a/htdocs/install/mysql/data/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql @@ -59,3 +59,7 @@ insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (28,'BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',10); insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (29,'FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',29); insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (30,'PROJECT_CREATE','Project creation','Executed when a project is created','project',30); +insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (31,'PROPAL_CLOSE_SIGNED','Customer proposal closed signed','Executed when a customer proposal is closed signed','propal',31); +insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (32,'PROPAL_CLOSE_REFUSED','Customer proposal closed refused','Executed when a customer proposal is closed refused','propal',32); +insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (33,'BILL_SUPPLIER_CANCELED','Supplier invoice cancelled','Executed when a supplier invoice is cancelled','invoice_supplier',33); +insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (34,'MEMBER_MODIFY','Member modified','Executed when a member is modified','member',34); From c9c75a1c083fc1712f3c8f8edd322e0df429091d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Wed, 26 Mar 2014 16:28:54 +0100 Subject: [PATCH 02/13] Action triggers: Added copyright Reindented the whole block because it was out. --- .../mysql/data/llx_c_action_trigger.sql | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql index 7addf0aaf8a..6905f4777cc 100644 --- a/htdocs/install/mysql/data/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql @@ -1,12 +1,13 @@ --- Copyright (C) 2001-2004 Rodolphe Quiedeville --- Copyright (C) 2003 Jean-Louis Bergamo --- Copyright (C) 2004-2013 Laurent Destailleur --- Copyright (C) 2004 Benoit Mortier --- Copyright (C) 2004 Guillaume Delecourt --- Copyright (C) 2005-2011 Regis Houssin --- Copyright (C) 2007 Patrick Raguin --- Copyright (C) 2010-2013 Juanjo Menent --- Copyright (C) 2013 Cedric Gross +-- Copyright (C) 2001-2004 Rodolphe Quiedeville +-- Copyright (C) 2003 Jean-Louis Bergamo +-- Copyright (C) 2004-2013 Laurent Destailleur +-- Copyright (C) 2004 Benoit Mortier +-- Copyright (C) 2004 Guillaume Delecourt +-- Copyright (C) 2005-2011 Regis Houssin +-- Copyright (C) 2007 Patrick Raguin +-- Copyright (C) 2010-2013 Juanjo Menent +-- Copyright (C) 2013 Cedric Gross +-- Copyright (C) 2014 Raphaël Doursenaud -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by From 8d6084db39b45777c11380593c97b5c1fef7ea75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Wed, 26 Mar 2014 17:13:42 +0100 Subject: [PATCH 03/13] Automatic agenda triggers: uncomment useful syslog The syslog was commented but is useful to spot unimplemented handlers that were nonetheless enabled in the administration interface. Also made it issue a warning level message. --- .../interface_50_modAgenda_ActionsAuto.class.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php index 856ca34c693..7b0843e2421 100644 --- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php +++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php @@ -633,14 +633,12 @@ class InterfaceActionsAuto $ok=1; } - // If not found - /* - else - { - dol_syslog("Trigger '".$this->name."' for action '$action' was ran by ".__FILE__." but no handler found for this action."); + // The trigger was enabled but we are missing the implementation, let the log know + else + { + dol_syslog("Trigger '".$this->name."' for action '$action' was ran by ".__FILE__." but no handler found for this action.", LOG_WARNING); return 0; - } - */ + } // Add entry in event table if ($ok) From ee71e42b342790e3b0b0f4a09463f48e4df49366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Wed, 26 Mar 2014 17:22:34 +0100 Subject: [PATCH 04/13] Action triggers: added missing triggers to 3.6 migration script These are the same changes than commit 3afb3a874d9d1533947651de9db28c9207278908 but for the migration script --- htdocs/install/mysql/migration/3.5.0-3.6.0.sql | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/htdocs/install/mysql/migration/3.5.0-3.6.0.sql b/htdocs/install/mysql/migration/3.5.0-3.6.0.sql index d6cd4090ddf..3c6a2662ada 100644 --- a/htdocs/install/mysql/migration/3.5.0-3.6.0.sql +++ b/htdocs/install/mysql/migration/3.5.0-3.6.0.sql @@ -1108,3 +1108,9 @@ ALTER TABLE llx_societe ADD UNIQUE INDEX uk_societe_barcode (barcode, fk_barcode ALTER TABLE llx_tva ADD COLUMN fk_typepayment integer NULL; -- table may already contains data ALTER TABLE llx_tva ADD COLUMN num_payment varchar(50); + +-- Add missing action triggers +insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (31,'PROPAL_CLOSE_SIGNED','Customer proposal closed signed','Executed when a customer proposal is closed signed','propal',31); +insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (32,'PROPAL_CLOSE_REFUSED','Customer proposal closed refused','Executed when a customer proposal is closed refused','propal',32); +insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (33,'BILL_SUPPLIER_CANCELED','Supplier invoice cancelled','Executed when a supplier invoice is cancelled','invoice_supplier',33); +insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (34,'MEMBER_MODIFY','Member modified','Executed when a member is modified','member',34); From 0d7a76d8db45fac435f07392598ae5d2ca381445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Wed, 26 Mar 2014 17:24:04 +0100 Subject: [PATCH 05/13] 3.6 migration script: fixed invalid comments --- htdocs/install/mysql/migration/3.5.0-3.6.0.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/install/mysql/migration/3.5.0-3.6.0.sql b/htdocs/install/mysql/migration/3.5.0-3.6.0.sql index 3c6a2662ada..84ecee3b2e0 100644 --- a/htdocs/install/mysql/migration/3.5.0-3.6.0.sql +++ b/htdocs/install/mysql/migration/3.5.0-3.6.0.sql @@ -1029,7 +1029,7 @@ create table llx_product_customer_price_log import_key varchar(14) -- Import key )ENGINE=innodb; ---Batch number managment +-- Batch number management ALTER TABLE llx_product ADD COLUMN tobatch tinyint DEFAULT 0 NOT NULL; CREATE TABLE llx_product_batch ( @@ -1055,7 +1055,7 @@ CREATE TABLE llx_expeditiondet_batch ( KEY ix_fk_expeditiondet (fk_expeditiondet) ) ENGINE=InnoDB; ---Salary payment in tax module +-- Salary payment in tax module --DROP TABLE llx_payment_salary CREATE TABLE llx_payment_salary ( rowid integer AUTO_INCREMENT PRIMARY KEY, @@ -1076,11 +1076,11 @@ CREATE TABLE llx_payment_salary ( fk_user_modif integer )ENGINE=innodb; ---New 1074 : Stock mouvement link to origin +-- New 1074 : Stock mouvement link to origin ALTER TABLE llx_stock_mouvement ADD fk_origin integer; ALTER TABLE llx_stock_mouvement ADD origintype VARCHAR(32); ---New 1300 : Add THM on user +-- New 1300 : Add THM on user ALTER TABLE llx_user ADD thm double(24,8); ALTER TABLE llx_projet_task_time ADD thm double(24,8); From cd7a378eb04b09a7d6f4cfe0c18251330c578f76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Wed, 26 Mar 2014 17:28:59 +0100 Subject: [PATCH 06/13] Action triggers/Langs: fixed a bad translation key --- htdocs/langs/ar_SA/other.lang | 2 +- htdocs/langs/bg_BG/other.lang | 2 +- htdocs/langs/bs_BA/other.lang | 2 +- htdocs/langs/ca_ES/other.lang | 2 +- htdocs/langs/cs_CZ/other.lang | 2 +- htdocs/langs/da_DK/other.lang | 2 +- htdocs/langs/de_DE/other.lang | 2 +- htdocs/langs/el_GR/other.lang | 2 +- htdocs/langs/en_US/other.lang | 2 +- htdocs/langs/es_ES/other.lang | 2 +- htdocs/langs/et_EE/other.lang | 2 +- htdocs/langs/eu_ES/other.lang | 2 +- htdocs/langs/fa_IR/other.lang | 2 +- htdocs/langs/fi_FI/other.lang | 2 +- htdocs/langs/fr_FR/other.lang | 2 +- htdocs/langs/he_IL/other.lang | 2 +- htdocs/langs/hr_HR/other.lang | 2 +- htdocs/langs/hu_HU/other.lang | 2 +- htdocs/langs/id_ID/other.lang | 2 +- htdocs/langs/is_IS/other.lang | 2 +- htdocs/langs/it_IT/other.lang | 2 +- htdocs/langs/ja_JP/other.lang | 2 +- htdocs/langs/ko_KR/other.lang | 2 +- htdocs/langs/lt_LT/other.lang | 2 +- htdocs/langs/lv_LV/other.lang | 2 +- htdocs/langs/mk_MK/other.lang | 2 +- htdocs/langs/nb_NO/other.lang | 2 +- htdocs/langs/nl_NL/other.lang | 2 +- htdocs/langs/pl_PL/other.lang | 2 +- htdocs/langs/pt_PT/other.lang | 2 +- htdocs/langs/ro_RO/other.lang | 2 +- htdocs/langs/ru_RU/other.lang | 2 +- htdocs/langs/sk_SK/other.lang | 2 +- htdocs/langs/sl_SI/other.lang | 2 +- htdocs/langs/sv_SE/other.lang | 2 +- htdocs/langs/th_TH/other.lang | 2 +- htdocs/langs/tr_TR/other.lang | 2 +- htdocs/langs/uk_UA/other.lang | 2 +- htdocs/langs/uz_UZ/other.lang | 2 +- htdocs/langs/vi_VN/other.lang | 2 +- htdocs/langs/zh_CN/other.lang | 2 +- htdocs/langs/zh_TW/other.lang | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/htdocs/langs/ar_SA/other.lang b/htdocs/langs/ar_SA/other.lang index f835dacd6ab..2832a2c0910 100644 --- a/htdocs/langs/ar_SA/other.lang +++ b/htdocs/langs/ar_SA/other.lang @@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=انسحاب الائتمان Notify_WITHDRAW_EMIT=Isue انسحاب Notify_ORDER_SENTBYMAIL=النظام العميل ترسل عن طريق البريد Notify_COMPANY_CREATE=طرف ثالث خلق -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card Notify_PROPAL_SENTBYMAIL=اقتراح التجارية المرسلة عن طريق البريد Notify_ORDER_SENTBYMAIL=النظام العميل ترسل عن طريق البريد Notify_BILL_PAYED=دفعت فاتورة العميل diff --git a/htdocs/langs/bg_BG/other.lang b/htdocs/langs/bg_BG/other.lang index 9206cca4667..726c49bc2e0 100644 --- a/htdocs/langs/bg_BG/other.lang +++ b/htdocs/langs/bg_BG/other.lang @@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Оттегляне на кредитирането Notify_WITHDRAW_EMIT=Извършване на оттегляне Notify_ORDER_SENTBYMAIL=Поръчка на клиента, изпратено по пощата Notify_COMPANY_CREATE=Третата страна е създадена -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card Notify_PROPAL_SENTBYMAIL=Търговско предложение, изпратено по пощата Notify_ORDER_SENTBYMAIL=Поръчка на клиента, изпратено по пощата Notify_BILL_PAYED=Фактурата на клиента е платена diff --git a/htdocs/langs/bs_BA/other.lang b/htdocs/langs/bs_BA/other.lang index 9634746c669..74fd18f8d76 100644 --- a/htdocs/langs/bs_BA/other.lang +++ b/htdocs/langs/bs_BA/other.lang @@ -22,7 +22,7 @@ # Notify_WITHDRAW_EMIT=Perform withdrawal # Notify_ORDER_SENTBYMAIL=Customer order sent by mail # Notify_COMPANY_CREATE=Third party created -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card # Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail # Notify_ORDER_SENTBYMAIL=Customer order sent by mail # Notify_BILL_PAYED=Customer invoice payed diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang index 34236dcac02..488fc5ed1b9 100644 --- a/htdocs/langs/ca_ES/other.lang +++ b/htdocs/langs/ca_ES/other.lang @@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Abonament domiciliació Notify_WITHDRAW_EMIT=Emissió domiciliació Notify_ORDER_SENTBYMAIL=Enviament comanda de client per e-mail Notify_COMPANY_CREATE=Creació tercer -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card Notify_PROPAL_SENTBYMAIL=Enviament pressupost per e-mail Notify_ORDER_SENTBYMAIL=Enviament comanda de client per e-mail Notify_BILL_PAYED=Cobrament factura a client diff --git a/htdocs/langs/cs_CZ/other.lang b/htdocs/langs/cs_CZ/other.lang index 10b3f864012..d480a64bdae 100644 --- a/htdocs/langs/cs_CZ/other.lang +++ b/htdocs/langs/cs_CZ/other.lang @@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Kreditní stažení Notify_WITHDRAW_EMIT=Proveďte stažení Notify_ORDER_SENTBYMAIL=Zákazníka zasílaný poštou Notify_COMPANY_CREATE=Třetí strana vytvořena -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card Notify_PROPAL_SENTBYMAIL=Komerční návrh zaslat poštou Notify_ORDER_SENTBYMAIL=Zákazníka zasílaný poštou Notify_BILL_PAYED=Zákazník platí faktury diff --git a/htdocs/langs/da_DK/other.lang b/htdocs/langs/da_DK/other.lang index 1d0b3294164..6035d2adfbd 100644 --- a/htdocs/langs/da_DK/other.lang +++ b/htdocs/langs/da_DK/other.lang @@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Credit tilbagetrækning Notify_WITHDRAW_EMIT=Isue tilbagetrækning Notify_ORDER_SENTBYMAIL=Kundens ordre sendes med posten Notify_COMPANY_CREATE=Tredjeparts oprettet -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card Notify_PROPAL_SENTBYMAIL=Kommercielle forslaget, som sendes med posten Notify_ORDER_SENTBYMAIL=Kundens ordre sendes med posten Notify_BILL_PAYED=Kundens faktura betales diff --git a/htdocs/langs/de_DE/other.lang b/htdocs/langs/de_DE/other.lang index ba8b2948e24..970504432c7 100644 --- a/htdocs/langs/de_DE/other.lang +++ b/htdocs/langs/de_DE/other.lang @@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Kreditkarten Rücknahme Notify_WITHDRAW_EMIT=Ausgabe aussetzen Notify_ORDER_SENTBYMAIL=Kundenbestellung mit E-Mail versendet Notify_COMPANY_CREATE=Durch Dritte erstellt -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card Notify_PROPAL_SENTBYMAIL=Angebot mit E-Mail gesendet Notify_ORDER_SENTBYMAIL=Kundenbestellung mit E-Mail versendet Notify_BILL_PAYED=Kundenrechnung bezahlt diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang index 37aec82169e..b520b2ab1dc 100644 --- a/htdocs/langs/el_GR/other.lang +++ b/htdocs/langs/el_GR/other.lang @@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Πιστωτικές απόσυρση Notify_WITHDRAW_EMIT=Εκτελέστε την απόσυρση Notify_ORDER_SENTBYMAIL=Για πελατών αποστέλλονται με το ταχυδρομείο Notify_COMPANY_CREATE=Τρίτο κόμμα δημιουργήθηκε -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card Notify_PROPAL_SENTBYMAIL=Εμπορικές προτάσεις που αποστέλλονται ταχυδρομικώς Notify_ORDER_SENTBYMAIL=Για πελατών αποστέλλονται με το ταχυδρομείο Notify_BILL_PAYED=Τιμολογίου Πελατών payed diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang index f6f6e89a0dc..4621c9f40ec 100644 --- a/htdocs/langs/en_US/other.lang +++ b/htdocs/langs/en_US/other.lang @@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Credit withdrawal Notify_WITHDRAW_EMIT=Perform withdrawal Notify_ORDER_SENTBYMAIL=Customer order sent by mail Notify_COMPANY_CREATE=Third party created -Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +Notify_COMPANY_SENTBYMAIL=Mails sent from third party card Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail Notify_ORDER_SENTBYMAIL=Envío pedido por e-mail Notify_BILL_PAYED=Customer invoice payed diff --git a/htdocs/langs/es_ES/other.lang b/htdocs/langs/es_ES/other.lang index ead720384db..698e1e86769 100644 --- a/htdocs/langs/es_ES/other.lang +++ b/htdocs/langs/es_ES/other.lang @@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Abono domiciliación Notify_WITHDRAW_EMIT=Emisión domiciliación Notify_ORDER_SENTBYMAIL=Envío pedido de cliente por e-mail Notify_COMPANY_CREATE=Creación tercero -Notify_COMPANY_COMPANY_SENTBYMAIL=E-mail enviado desde la ficha del tercero +Notify_COMPANY_SENTBYMAIL=E-mail enviado desde la ficha del tercero Notify_PROPAL_SENTBYMAIL=Envío presupuesto por e-mail Notify_ORDER_SENTBYMAIL=Envío pedido de cliente por e-mail Notify_BILL_PAYED=Cobro factura a cliente diff --git a/htdocs/langs/et_EE/other.lang b/htdocs/langs/et_EE/other.lang index c66f06943f4..56ac899cebb 100644 --- a/htdocs/langs/et_EE/other.lang +++ b/htdocs/langs/et_EE/other.lang @@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Krediidi väljamakse Notify_WITHDRAW_EMIT=Väljamakse teostamine Notify_ORDER_SENTBYMAIL=Müügitellimus saadetud postiga Notify_COMPANY_CREATE=Kolmas isik loodud -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card Notify_PROPAL_SENTBYMAIL=Müügipakkumine saadetud postiga Notify_ORDER_SENTBYMAIL=Müügitellimus saadetud postiga Notify_BILL_PAYED=Müügiarve tasutud diff --git a/htdocs/langs/eu_ES/other.lang b/htdocs/langs/eu_ES/other.lang index 9634746c669..74fd18f8d76 100644 --- a/htdocs/langs/eu_ES/other.lang +++ b/htdocs/langs/eu_ES/other.lang @@ -22,7 +22,7 @@ # Notify_WITHDRAW_EMIT=Perform withdrawal # Notify_ORDER_SENTBYMAIL=Customer order sent by mail # Notify_COMPANY_CREATE=Third party created -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card # Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail # Notify_ORDER_SENTBYMAIL=Customer order sent by mail # Notify_BILL_PAYED=Customer invoice payed diff --git a/htdocs/langs/fa_IR/other.lang b/htdocs/langs/fa_IR/other.lang index 44eab369856..249886843d3 100644 --- a/htdocs/langs/fa_IR/other.lang +++ b/htdocs/langs/fa_IR/other.lang @@ -22,7 +22,7 @@ Notify_PROPAL_VALIDATE=التحقق من صحة اقتراح العملاء # Notify_WITHDRAW_EMIT=Perform withdrawal Notify_ORDER_SENTBYMAIL=Envío pedido POR پست الکترونیک Notify_COMPANY_CREATE=شخص ثالث آفریده شده -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card Notify_PROPAL_SENTBYMAIL=پیشنهاد تجاری فرستاده شده توسط پست الکترونیکی Notify_ORDER_SENTBYMAIL=Envío pedido POR پست الکترونیک Notify_BILL_PAYED=صورتحساب مشتری payed diff --git a/htdocs/langs/fi_FI/other.lang b/htdocs/langs/fi_FI/other.lang index 66b1e5548e4..18bd1a78ac8 100644 --- a/htdocs/langs/fi_FI/other.lang +++ b/htdocs/langs/fi_FI/other.lang @@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Luotto peruuttaminen Notify_WITHDRAW_EMIT=Isue peruuttaminen Notify_ORDER_SENTBYMAIL=Asiakas tilaa postitse Notify_COMPANY_CREATE=Kolmannen osapuolen luotu -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card Notify_PROPAL_SENTBYMAIL=Kaupallinen ehdotus lähetetään postitse Notify_ORDER_SENTBYMAIL=Asiakas tilaa postitse Notify_BILL_PAYED=Asiakas laskun maksanut diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang index 82dc6365765..10d8bc34000 100644 --- a/htdocs/langs/fr_FR/other.lang +++ b/htdocs/langs/fr_FR/other.lang @@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Crédit prélèvement Notify_WITHDRAW_EMIT=Émission prélèvement Notify_ORDER_SENTBYMAIL=Envoi commande client par email Notify_COMPANY_CREATE=Tiers créé -Notify_COMPANY_COMPANY_SENTBYMAIL=Mail envoyé depuis la fiche Tiers +Notify_COMPANY_SENTBYMAIL=Mail envoyé depuis la fiche Tiers Notify_PROPAL_SENTBYMAIL=Envoi proposition commerciale par email Notify_ORDER_SENTBYMAIL=Envoi commande client par email Notify_BILL_PAYED=Recouvrement facture client diff --git a/htdocs/langs/he_IL/other.lang b/htdocs/langs/he_IL/other.lang index 42461d381c9..a28845063f2 100644 --- a/htdocs/langs/he_IL/other.lang +++ b/htdocs/langs/he_IL/other.lang @@ -22,7 +22,7 @@ # Notify_WITHDRAW_EMIT=Perform withdrawal # Notify_ORDER_SENTBYMAIL=Customer order sent by mail # Notify_COMPANY_CREATE=Third party created -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card # Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail # Notify_ORDER_SENTBYMAIL=Customer order sent by mail # Notify_BILL_PAYED=Customer invoice payed diff --git a/htdocs/langs/hr_HR/other.lang b/htdocs/langs/hr_HR/other.lang index 9634746c669..74fd18f8d76 100644 --- a/htdocs/langs/hr_HR/other.lang +++ b/htdocs/langs/hr_HR/other.lang @@ -22,7 +22,7 @@ # Notify_WITHDRAW_EMIT=Perform withdrawal # Notify_ORDER_SENTBYMAIL=Customer order sent by mail # Notify_COMPANY_CREATE=Third party created -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card # Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail # Notify_ORDER_SENTBYMAIL=Customer order sent by mail # Notify_BILL_PAYED=Customer invoice payed diff --git a/htdocs/langs/hu_HU/other.lang b/htdocs/langs/hu_HU/other.lang index 01851d5e2e2..61eb151e7a7 100644 --- a/htdocs/langs/hu_HU/other.lang +++ b/htdocs/langs/hu_HU/other.lang @@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Hitel visszavonása Notify_WITHDRAW_EMIT=Isue visszavonása Notify_ORDER_SENTBYMAIL=Ügyfél érdekében postai úton Notify_COMPANY_CREATE=Harmadik fél létre -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card Notify_PROPAL_SENTBYMAIL=Kereskedelmi által küldött javaslatban mail Notify_ORDER_SENTBYMAIL=Ügyfél érdekében postai úton Notify_BILL_PAYED=Az ügyfél számlát fizetni diff --git a/htdocs/langs/id_ID/other.lang b/htdocs/langs/id_ID/other.lang index 044acb61fc7..65b5b28c523 100644 --- a/htdocs/langs/id_ID/other.lang +++ b/htdocs/langs/id_ID/other.lang @@ -22,7 +22,7 @@ # Notify_WITHDRAW_EMIT=Perform withdrawal # Notify_ORDER_SENTBYMAIL=Customer order sent by mail # Notify_COMPANY_CREATE=Third party created -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card # Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail # Notify_ORDER_SENTBYMAIL=Customer order sent by mail # Notify_BILL_PAYED=Customer invoice payed diff --git a/htdocs/langs/is_IS/other.lang b/htdocs/langs/is_IS/other.lang index 4bab1ec88f3..82f3d6c5b8d 100644 --- a/htdocs/langs/is_IS/other.lang +++ b/htdocs/langs/is_IS/other.lang @@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Credit afturköllun Notify_WITHDRAW_EMIT=Isue afturköllun Notify_ORDER_SENTBYMAIL=Viðskiptavinur röð send með pósti Notify_COMPANY_CREATE=Þriðja aðila til -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card Notify_PROPAL_SENTBYMAIL=Auglýsing tillögu send með pósti Notify_ORDER_SENTBYMAIL=Viðskiptavinur röð send með pósti Notify_BILL_PAYED=Viðskiptavinur Reikningar borgað diff --git a/htdocs/langs/it_IT/other.lang b/htdocs/langs/it_IT/other.lang index 906223f4c58..d3e855e6c81 100644 --- a/htdocs/langs/it_IT/other.lang +++ b/htdocs/langs/it_IT/other.lang @@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Accredita prelievo Notify_WITHDRAW_EMIT=Esegui prelievo Notify_ORDER_SENTBYMAIL=Ordine cliente inviato per email Notify_COMPANY_CREATE=Creato soggetto terzo -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card Notify_PROPAL_SENTBYMAIL=Proposta inviata per email Notify_ORDER_SENTBYMAIL=Ordine cliente inviato per email Notify_BILL_PAYED=Fattura attiva pagata diff --git a/htdocs/langs/ja_JP/other.lang b/htdocs/langs/ja_JP/other.lang index 9eaf3566479..baf984ca6a1 100644 --- a/htdocs/langs/ja_JP/other.lang +++ b/htdocs/langs/ja_JP/other.lang @@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=クレジット撤退 Notify_WITHDRAW_EMIT=撤退を実行します。 Notify_ORDER_SENTBYMAIL=Envío pedido POR電子メール Notify_COMPANY_CREATE=第三者が作成した -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card Notify_PROPAL_SENTBYMAIL=電子メールによって送信された商業提案 Notify_ORDER_SENTBYMAIL=Envío pedido POR電子メール Notify_BILL_PAYED=顧客への請求はpayed diff --git a/htdocs/langs/ko_KR/other.lang b/htdocs/langs/ko_KR/other.lang index 56890bf7616..d5a3f8e2b37 100644 --- a/htdocs/langs/ko_KR/other.lang +++ b/htdocs/langs/ko_KR/other.lang @@ -22,7 +22,7 @@ # Notify_WITHDRAW_EMIT=Perform withdrawal # Notify_ORDER_SENTBYMAIL=Customer order sent by mail # Notify_COMPANY_CREATE=Third party created -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card # Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail # Notify_ORDER_SENTBYMAIL=Customer order sent by mail # Notify_BILL_PAYED=Customer invoice payed diff --git a/htdocs/langs/lt_LT/other.lang b/htdocs/langs/lt_LT/other.lang index 9634746c669..74fd18f8d76 100644 --- a/htdocs/langs/lt_LT/other.lang +++ b/htdocs/langs/lt_LT/other.lang @@ -22,7 +22,7 @@ # Notify_WITHDRAW_EMIT=Perform withdrawal # Notify_ORDER_SENTBYMAIL=Customer order sent by mail # Notify_COMPANY_CREATE=Third party created -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card # Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail # Notify_ORDER_SENTBYMAIL=Customer order sent by mail # Notify_BILL_PAYED=Customer invoice payed diff --git a/htdocs/langs/lv_LV/other.lang b/htdocs/langs/lv_LV/other.lang index 1ee9bad6dc6..20fef739d7a 100644 --- a/htdocs/langs/lv_LV/other.lang +++ b/htdocs/langs/lv_LV/other.lang @@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Kredīta izņemšana Notify_WITHDRAW_EMIT=Veikt atcelšanu Notify_ORDER_SENTBYMAIL=Klienta rīkojumam, kas nosūtīts pa pastu Notify_COMPANY_CREATE=Trešās puse izveidota -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card Notify_PROPAL_SENTBYMAIL=Commercial priekšlikums nosūtīts pa pastu Notify_ORDER_SENTBYMAIL=Klienta rīkojumam, kas nosūtīts pa pastu Notify_BILL_PAYED=Klienta rēķins samaksāts diff --git a/htdocs/langs/mk_MK/other.lang b/htdocs/langs/mk_MK/other.lang index 9634746c669..74fd18f8d76 100644 --- a/htdocs/langs/mk_MK/other.lang +++ b/htdocs/langs/mk_MK/other.lang @@ -22,7 +22,7 @@ # Notify_WITHDRAW_EMIT=Perform withdrawal # Notify_ORDER_SENTBYMAIL=Customer order sent by mail # Notify_COMPANY_CREATE=Third party created -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card # Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail # Notify_ORDER_SENTBYMAIL=Customer order sent by mail # Notify_BILL_PAYED=Customer invoice payed diff --git a/htdocs/langs/nb_NO/other.lang b/htdocs/langs/nb_NO/other.lang index 1a548f15258..9289b2883e5 100644 --- a/htdocs/langs/nb_NO/other.lang +++ b/htdocs/langs/nb_NO/other.lang @@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Credit tilbaketrekning Notify_WITHDRAW_EMIT=Isue tilbaketrekning Notify_ORDER_SENTBYMAIL=Kundeordre sendt i posten Notify_COMPANY_CREATE=Tredjeparts opprettet -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card Notify_PROPAL_SENTBYMAIL=Kommersiell forslaget sendes med post Notify_ORDER_SENTBYMAIL=Kundeordre sendt i posten Notify_BILL_PAYED=Kunden faktura betales diff --git a/htdocs/langs/nl_NL/other.lang b/htdocs/langs/nl_NL/other.lang index b97803ce155..2018283dd7b 100644 --- a/htdocs/langs/nl_NL/other.lang +++ b/htdocs/langs/nl_NL/other.lang @@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Credit terugtrekking Notify_WITHDRAW_EMIT=Isue terugtrekking Notify_ORDER_SENTBYMAIL=Bestelling van de klant per e-mail Notify_COMPANY_CREATE=Third party gemaakt -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card Notify_PROPAL_SENTBYMAIL=Commercieel voorstel per e-mail Notify_ORDER_SENTBYMAIL=Bestelling van de klant per e-mail Notify_BILL_PAYED=Klant factuur betaald diff --git a/htdocs/langs/pl_PL/other.lang b/htdocs/langs/pl_PL/other.lang index bacfcbde334..08167bc0c56 100644 --- a/htdocs/langs/pl_PL/other.lang +++ b/htdocs/langs/pl_PL/other.lang @@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Wycofanie kredyt Notify_WITHDRAW_EMIT=Wycofanie Isue Notify_ORDER_SENTBYMAIL=Zamówienie klienta wysyłane pocztą Notify_COMPANY_CREATE=Trzeciej stworzone -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card Notify_PROPAL_SENTBYMAIL=Gospodarczy wniosek przesłany pocztą Notify_ORDER_SENTBYMAIL=Zamówienie klienta wysyłane pocztą Notify_BILL_PAYED=Klient zapłaci faktury diff --git a/htdocs/langs/pt_PT/other.lang b/htdocs/langs/pt_PT/other.lang index 2c4fd153502..49ed4c2238d 100644 --- a/htdocs/langs/pt_PT/other.lang +++ b/htdocs/langs/pt_PT/other.lang @@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Retirada de crédito Notify_WITHDRAW_EMIT=Realizar a retirada Notify_ORDER_SENTBYMAIL=Pedido do cliente enviado pelo correio Notify_COMPANY_CREATE=Terceiro criado -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card Notify_PROPAL_SENTBYMAIL=Proposta comercial enviada por correio Notify_ORDER_SENTBYMAIL=Pedido do cliente enviado pelo correio Notify_BILL_PAYED=Fatura de Cliente paga diff --git a/htdocs/langs/ro_RO/other.lang b/htdocs/langs/ro_RO/other.lang index 733f77c901d..51741cf7402 100644 --- a/htdocs/langs/ro_RO/other.lang +++ b/htdocs/langs/ro_RO/other.lang @@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Credit de retragere Notify_WITHDRAW_EMIT=Isue retragere Notify_ORDER_SENTBYMAIL=Comanda clientului trimise prin poştă Notify_COMPANY_CREATE=Terţ a creat -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card Notify_PROPAL_SENTBYMAIL=Propunerea comercial trimise prin poştă Notify_ORDER_SENTBYMAIL=Comanda clientului trimise prin poştă Notify_BILL_PAYED=Factura platita clienţilor diff --git a/htdocs/langs/ru_RU/other.lang b/htdocs/langs/ru_RU/other.lang index ddefd90dca5..fd31c2723ba 100644 --- a/htdocs/langs/ru_RU/other.lang +++ b/htdocs/langs/ru_RU/other.lang @@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Кредитный выход Notify_WITHDRAW_EMIT=Isue вывода Notify_ORDER_SENTBYMAIL=Покупатель делает заказ по почте Notify_COMPANY_CREATE=Третья партия, созданная -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card Notify_PROPAL_SENTBYMAIL=Коммерческое предложение по почте Notify_ORDER_SENTBYMAIL=Покупатель делает заказ по почте Notify_BILL_PAYED=Клиенту счет оплачен diff --git a/htdocs/langs/sk_SK/other.lang b/htdocs/langs/sk_SK/other.lang index d6b4396bb63..3034f45c866 100644 --- a/htdocs/langs/sk_SK/other.lang +++ b/htdocs/langs/sk_SK/other.lang @@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Kreditné stiahnutiu Notify_WITHDRAW_EMIT=Preveďte stiahnutiu Notify_ORDER_SENTBYMAIL=Zákazníka zasielaný poštou Notify_COMPANY_CREATE=Tretia strana vytvorená -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card Notify_PROPAL_SENTBYMAIL=Komerčné návrh zaslať poštou Notify_ORDER_SENTBYMAIL=Zákazníka zasielaný poštou Notify_BILL_PAYED=Zákazník platí faktúry diff --git a/htdocs/langs/sl_SI/other.lang b/htdocs/langs/sl_SI/other.lang index 1c584909cc9..b9c3504c000 100644 --- a/htdocs/langs/sl_SI/other.lang +++ b/htdocs/langs/sl_SI/other.lang @@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Nakazilo kredita Notify_WITHDRAW_EMIT=Nakazilo izdatka Notify_ORDER_SENTBYMAIL=Naročilo po e-pošti Notify_COMPANY_CREATE=Ustvarjen partner -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card Notify_PROPAL_SENTBYMAIL=Komercialna ponudba poslana po e-pošti Notify_ORDER_SENTBYMAIL=Naročilo po e-pošti Notify_BILL_PAYED=Plačan račun kupca diff --git a/htdocs/langs/sv_SE/other.lang b/htdocs/langs/sv_SE/other.lang index 83c1d0b11aa..f071901f687 100644 --- a/htdocs/langs/sv_SE/other.lang +++ b/htdocs/langs/sv_SE/other.lang @@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Credit tillbakadragande Notify_WITHDRAW_EMIT=Isue tillbakadragande Notify_ORDER_SENTBYMAIL=Kundorder skickas per post Notify_COMPANY_CREATE=Tredje part som skapats -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card Notify_PROPAL_SENTBYMAIL=Kommersiell förslag skickas per post Notify_ORDER_SENTBYMAIL=Kundorder skickas per post Notify_BILL_PAYED=Kundfaktura betalade diff --git a/htdocs/langs/th_TH/other.lang b/htdocs/langs/th_TH/other.lang index 9634746c669..74fd18f8d76 100644 --- a/htdocs/langs/th_TH/other.lang +++ b/htdocs/langs/th_TH/other.lang @@ -22,7 +22,7 @@ # Notify_WITHDRAW_EMIT=Perform withdrawal # Notify_ORDER_SENTBYMAIL=Customer order sent by mail # Notify_COMPANY_CREATE=Third party created -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card # Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail # Notify_ORDER_SENTBYMAIL=Customer order sent by mail # Notify_BILL_PAYED=Customer invoice payed diff --git a/htdocs/langs/tr_TR/other.lang b/htdocs/langs/tr_TR/other.lang index 88b4dfb1a41..da01846b565 100644 --- a/htdocs/langs/tr_TR/other.lang +++ b/htdocs/langs/tr_TR/other.lang @@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=Kredi çekme Notify_WITHDRAW_EMIT=Para çekme uygula Notify_ORDER_SENTBYMAIL=Müşteri siparişi posta ile gönderildi Notify_COMPANY_CREATE=Üçüncü parti oluşturuldu -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card Notify_PROPAL_SENTBYMAIL=Teklif posta ile gönderildi Notify_ORDER_SENTBYMAIL=Müşteri siparişi posta ile gönderildi Notify_BILL_PAYED=Müşteri faturası ödendi diff --git a/htdocs/langs/uk_UA/other.lang b/htdocs/langs/uk_UA/other.lang index 9634746c669..74fd18f8d76 100644 --- a/htdocs/langs/uk_UA/other.lang +++ b/htdocs/langs/uk_UA/other.lang @@ -22,7 +22,7 @@ # Notify_WITHDRAW_EMIT=Perform withdrawal # Notify_ORDER_SENTBYMAIL=Customer order sent by mail # Notify_COMPANY_CREATE=Third party created -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card # Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail # Notify_ORDER_SENTBYMAIL=Customer order sent by mail # Notify_BILL_PAYED=Customer invoice payed diff --git a/htdocs/langs/uz_UZ/other.lang b/htdocs/langs/uz_UZ/other.lang index 9634746c669..74fd18f8d76 100644 --- a/htdocs/langs/uz_UZ/other.lang +++ b/htdocs/langs/uz_UZ/other.lang @@ -22,7 +22,7 @@ # Notify_WITHDRAW_EMIT=Perform withdrawal # Notify_ORDER_SENTBYMAIL=Customer order sent by mail # Notify_COMPANY_CREATE=Third party created -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card # Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail # Notify_ORDER_SENTBYMAIL=Customer order sent by mail # Notify_BILL_PAYED=Customer invoice payed diff --git a/htdocs/langs/vi_VN/other.lang b/htdocs/langs/vi_VN/other.lang index d46a72c6555..a14794ad6de 100644 --- a/htdocs/langs/vi_VN/other.lang +++ b/htdocs/langs/vi_VN/other.lang @@ -22,7 +22,7 @@ # Notify_WITHDRAW_EMIT=Perform withdrawal # Notify_ORDER_SENTBYMAIL=Customer order sent by mail # Notify_COMPANY_CREATE=Third party created -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card # Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail # Notify_ORDER_SENTBYMAIL=Customer order sent by mail # Notify_BILL_PAYED=Customer invoice payed diff --git a/htdocs/langs/zh_CN/other.lang b/htdocs/langs/zh_CN/other.lang index 0811c04001d..109a62e6815 100644 --- a/htdocs/langs/zh_CN/other.lang +++ b/htdocs/langs/zh_CN/other.lang @@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=信贷撤离 Notify_WITHDRAW_EMIT=执行撤离 Notify_ORDER_SENTBYMAIL=通过邮件发送的客户订单 Notify_COMPANY_CREATE=第三方创建 -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card Notify_PROPAL_SENTBYMAIL=通过邮件发送的商业提案 Notify_ORDER_SENTBYMAIL=通过邮件发送的客户订单 Notify_BILL_PAYED=客户发票payed diff --git a/htdocs/langs/zh_TW/other.lang b/htdocs/langs/zh_TW/other.lang index 4f0466037d0..fa71922ade7 100644 --- a/htdocs/langs/zh_TW/other.lang +++ b/htdocs/langs/zh_TW/other.lang @@ -22,7 +22,7 @@ Notify_WITHDRAW_CREDIT=信貸撤離 Notify_WITHDRAW_EMIT=執行撤離 Notify_ORDER_SENTBYMAIL=通過郵件發送的客戶訂單 Notify_COMPANY_CREATE=第三方創建 -# Notify_COMPANY_COMPANY_SENTBYMAIL=Mails sent from third party card +# Notify_COMPANY_SENTBYMAIL=Mails sent from third party card Notify_PROPAL_SENTBYMAIL=通過郵件發送的商業提案 Notify_ORDER_SENTBYMAIL=通過郵件發送的客戶訂單 Notify_BILL_PAYED=客戶發票payed From c5d8892d8921ceecc59300b9d06a18e2507d0d85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Wed, 26 Mar 2014 18:12:48 +0100 Subject: [PATCH 07/13] Added a dev script to recursively deduplicate file lines on a per file basis This script is useful to deduplicate language files --- dev/deduplicatefilelinesrecursively.sh | 34 ++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100755 dev/deduplicatefilelinesrecursively.sh diff --git a/dev/deduplicatefilelinesrecursively.sh b/dev/deduplicatefilelinesrecursively.sh new file mode 100755 index 00000000000..2aaa05c0934 --- /dev/null +++ b/dev/deduplicatefilelinesrecursively.sh @@ -0,0 +1,34 @@ +#!/bin/bash +# Recursively deduplicate file lines on a per file basis +# Useful to deduplicate language files +# +# Needs awk 4.0 for the inplace fixing command +# +# Raphaël Doursenaud - rdoursenaud@gpcsolutions.fr + +# Syntax +if [ "x$1" != "xlist" -a "x$1" != "xfix" ] +then + echo "Usage: deduplicatefilelinesrecursively.sh [list|fix]" +fi + +# To detect +if [ "x$1" = "xlist" ] +then + for file in `find . -type f` + do + if [ `sort "$file" | uniq -d | wc -l` -gt 0 ] + then + echo "$file" + fi + done +fi + +# To fix +if [ "x$1" = "xfix" ] +then + for file in `find . -type f` + do + awk -i inplace ' !x[$0]++' "$file" + done; +fi From e07e86b824ef632a827c1c2d9aafe03399043cd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Wed, 26 Mar 2014 18:15:19 +0100 Subject: [PATCH 08/13] Deduplicated lines of the reference language files Used the new deduplicatefilelinesrecursively.sh script --- htdocs/langs/en_US/admin.lang | 1 - htdocs/langs/en_US/bills.lang | 1 - htdocs/langs/en_US/cashdesk.lang | 2 +- htdocs/langs/en_US/companies.lang | 2 +- htdocs/langs/en_US/contracts.lang | 2 +- htdocs/langs/en_US/cron.lang | 25 ------------------------- htdocs/langs/en_US/deliveries.lang | 2 +- htdocs/langs/en_US/dict.lang | 4 ---- htdocs/langs/en_US/donations.lang | 2 +- htdocs/langs/en_US/errors.lang | 2 -- htdocs/langs/en_US/externalsite.lang | 2 +- htdocs/langs/en_US/help.lang | 2 +- htdocs/langs/en_US/holiday.lang | 3 --- htdocs/langs/en_US/install.lang | 1 - htdocs/langs/en_US/interventions.lang | 2 +- htdocs/langs/en_US/ldap.lang | 2 +- htdocs/langs/en_US/mailmanspip.lang | 2 +- htdocs/langs/en_US/mails.lang | 3 --- htdocs/langs/en_US/margins.lang | 9 --------- htdocs/langs/en_US/members.lang | 1 - htdocs/langs/en_US/opensurvey.lang | 2 +- htdocs/langs/en_US/orders.lang | 7 +------ htdocs/langs/en_US/paypal.lang | 2 +- htdocs/langs/en_US/products.lang | 2 +- htdocs/langs/en_US/sendings.lang | 4 +--- htdocs/langs/en_US/stocks.lang | 2 +- htdocs/langs/en_US/suppliers.lang | 2 +- htdocs/langs/en_US/trips.lang | 2 +- htdocs/langs/en_US/users.lang | 2 +- 29 files changed, 19 insertions(+), 76 deletions(-) diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index e06f937d74a..562b0bb659e 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -389,7 +389,6 @@ AllBarcodeReset=All barcode values have been removed NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into barcode module setup. NoRecordWithoutBarcodeDefined=No record with no barcode value defined. - # Modules Module0Name=Users & groups Module0Desc=Users and groups management diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 805a3a6e2ea..9f8353acfda 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -315,7 +315,6 @@ PaymentConditionShortPT_5050=50-50 PaymentConditionPT_5050=50%% in advance, 50%% on delivery FixAmount=Fix amount VarAmount=Variable amount (%% tot.) - # PaymentType PaymentTypeVIR=Bank deposit PaymentTypeShortVIR=Bank deposit diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang index 22cc717df1a..d3dcfb68e64 100644 --- a/htdocs/langs/en_US/cashdesk.lang +++ b/htdocs/langs/en_US/cashdesk.lang @@ -37,4 +37,4 @@ ShowCompany=Show company ShowStock=Show warehouse DeleteArticle=Click to remove this article FilterRefOrLabelOrBC=Search (Ref/Label) -UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock. \ No newline at end of file +UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock. diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index 0762a40939c..3c8ba86ec7c 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -405,4 +405,4 @@ OutstandingBill=Max. for outstanding bill OutstandingBillReached=Reached max. for outstanding bill MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0. LeopardNumRefModelDesc=The code is free. This code can be modified at any time. -ManagingDirectors=Manager(s) name (CEO, director, president...) \ No newline at end of file +ManagingDirectors=Manager(s) name (CEO, director, president...) diff --git a/htdocs/langs/en_US/contracts.lang b/htdocs/langs/en_US/contracts.lang index c6727d9956c..622c8ca89d9 100644 --- a/htdocs/langs/en_US/contracts.lang +++ b/htdocs/langs/en_US/contracts.lang @@ -96,4 +96,4 @@ TypeContact_contrat_internal_SALESREPFOLL=Sales representative following-up cont TypeContact_contrat_external_BILLING=Billing customer contact TypeContact_contrat_external_CUSTOMER=Follow-up customer contact TypeContact_contrat_external_SALESREPSIGN=Signing contract customer contact -Error_CONTRACT_ADDON_NotDefined=Constant CONTRACT_ADDON not defined \ No newline at end of file +Error_CONTRACT_ADDON_NotDefined=Constant CONTRACT_ADDON not defined diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang index bd4b72b8236..01929768039 100644 --- a/htdocs/langs/en_US/cron.lang +++ b/htdocs/langs/en_US/cron.lang @@ -1,22 +1,16 @@ # Dolibarr language file - Source file is en_US - cron # # About page -# About = About CronAbout = About Cron CronAboutPage = Cron about page -# # Right -# Permission23101 = Read Scheduled task Permission23102 = Create/update Scheduled task Permission23103 = Delete Scheduled task Permission23104 = Execute Scheduled task - -# # Admin -# CronSetup= Scheduled job management setup URLToLaunchCronJobs=URL to check and launch cron jobs if required OrToLaunchASpecificJob=Or to check and launch a specific job @@ -24,20 +18,12 @@ KeyForCronAccess=Security key for URL to launch cron jobs FileToLaunchCronJobs=Command line to launch cron jobs CronExplainHowToRunUnix=On Unix environment you should use crontab to run Command line each minutes CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes - - -# # Menu -# CronJobs=Scheduled jobs CronListActive= List of active jobs CronListInactive= List of disabled jobs CronListActive= List of scheduled jobs - - -# # Page list -# CronDateLastRun=Last run CronLastOutput=Last run output CronLastResult=Last result code @@ -70,10 +56,7 @@ CronLabel=Description CronNbRun=Nb. launch CronEach=Every JobFinished=Job launched and finished - -# #Page card -# CronAdd= Add jobs CronHourStart= Start Hour and date of task CronEvery= And execute task each @@ -95,20 +78,12 @@ CronObjectHelp=The object name to load.
For exemple to fetch method of Doli CronMethodHelp=The object method to launch.
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth CronArgsHelp=The method arguments.
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef CronCommandHelp=The system command line to execute. - -# # Info -# CronInfoPage=Information - - -# # Common -# CronType=Task type CronType_method=Call method of a Dolibarr Class CronType_command=Shell command CronMenu=Cron CronCannotLoadClass=Cannot load class %s or object %s - UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. diff --git a/htdocs/langs/en_US/deliveries.lang b/htdocs/langs/en_US/deliveries.lang index fc4ff2436d4..cabd31a3a32 100644 --- a/htdocs/langs/en_US/deliveries.lang +++ b/htdocs/langs/en_US/deliveries.lang @@ -23,4 +23,4 @@ GoodStatusDeclaration=Have received the goods above in good condition, Deliverer=Deliverer : Sender=Sender Recipient=Recipient -ErrorStockIsNotEnough=There's not enough stock \ No newline at end of file +ErrorStockIsNotEnough=There's not enough stock diff --git a/htdocs/langs/en_US/dict.lang b/htdocs/langs/en_US/dict.lang index 65e21a2c5fc..4b724056147 100644 --- a/htdocs/langs/en_US/dict.lang +++ b/htdocs/langs/en_US/dict.lang @@ -253,7 +253,6 @@ CivilityMR=Mr. CivilityMLE=Ms. CivilityMTRE=Master CivilityDR=Doctor - ##### Currencies ##### Currencyeuros=Euros CurrencyAUD=AU Dollars @@ -290,10 +289,8 @@ CurrencyXOF=CFA Francs BCEAO CurrencySingXOF=CFA Franc BCEAO CurrencyXPF=CFP Francs CurrencySingXPF=CFP Franc - CurrencyCentSingEUR=cent CurrencyThousandthSingTND=thousandth - #### Input reasons ##### DemandReasonTypeSRC_INTE=Internet DemandReasonTypeSRC_CAMP_MAIL=Mailing campaign @@ -306,7 +303,6 @@ DemandReasonTypeSRC_WOM=Word of mouth DemandReasonTypeSRC_PARTNER=Partner DemandReasonTypeSRC_EMPLOYEE=Employee DemandReasonTypeSRC_SPONSORING=Sponsorship - #### Paper formats #### PaperFormatEU4A0=Format 4A0 PaperFormatEU2A0=Format 2A0 diff --git a/htdocs/langs/en_US/donations.lang b/htdocs/langs/en_US/donations.lang index db3d9572850..728661dfa04 100644 --- a/htdocs/langs/en_US/donations.lang +++ b/htdocs/langs/en_US/donations.lang @@ -29,4 +29,4 @@ LastModifiedDonations=Last %s modified donations SearchADonation=Search a donation DonationRecipient=Donation recipient ThankYou=Thank You -IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount \ No newline at end of file +IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang index b3908e70750..2edfa4effce 100644 --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -2,7 +2,6 @@ # No errors NoErrorCommitIsDone=No error, we commit - # Errors Error=Error Errors=Errors @@ -135,7 +134,6 @@ ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authe ErrorWarehouseMustDiffers=Source and target warehouses must differs ErrorBadFormat=Bad format! ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. - # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined WarningSafeModeOnCheckExecDir=Warning, PHP option safe_mode is on so command must be stored inside a directory declared by php parameter safe_mode_exec_dir. diff --git a/htdocs/langs/en_US/externalsite.lang b/htdocs/langs/en_US/externalsite.lang index 8c7f252e543..62da68c045d 100644 --- a/htdocs/langs/en_US/externalsite.lang +++ b/htdocs/langs/en_US/externalsite.lang @@ -1,4 +1,4 @@ # Dolibarr language file - Source file is en_US - externalsite ExternalSiteSetup=Setup link to external website ExternalSiteURL=External Site URL -ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. \ No newline at end of file +ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. diff --git a/htdocs/langs/en_US/help.lang b/htdocs/langs/en_US/help.lang index 98406a7c53a..29c9bec34f0 100644 --- a/htdocs/langs/en_US/help.lang +++ b/htdocs/langs/en_US/help.lang @@ -25,4 +25,4 @@ LinkToGoldMember=You can call one of the coach preselected by Dolibarr for your PossibleLanguages=Supported languages MakeADonation=Help Dolibarr project, make a donation SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation -SeeOfficalSupport=For official Dolibarr support in your language:
%s \ No newline at end of file +SeeOfficalSupport=For official Dolibarr support in your language:
%s diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang index 0289f5ce5ea..f5b104b8301 100644 --- a/htdocs/langs/en_US/holiday.lang +++ b/htdocs/langs/en_US/holiday.lang @@ -34,7 +34,6 @@ ReturnCP=Return to previous page ErrorUserViewCP=You are not authorized to read this request for holidays. InfosCP=Information of the demand of holidays InfosWorkflowCP=Information Workflow -DateCreateCP=Creation date RequestByCP=Requested by TitreRequestCP=Sheet of holidays NbUseDaysCP=Number of days of holidays consumed @@ -130,7 +129,6 @@ ErrorMailNotSend=An error occurred while sending email: NoCPforMonth=No leave this month. nbJours=Number days TitleAdminCP=Configuration of Holidays - #Messages Hello=Hello HolidaysToValidate=Validate holidays @@ -143,7 +141,6 @@ HolidaysRefused=Denied holidays HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason : HolidaysCanceled=Canceled holidays HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled. - Permission20001=Read/create/modify their holidays Permission20002=Read/modify all requests of holidays Permission20003=Delete their holidays requests diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang index dd00b3ffb91..d4da279f8cb 100644 --- a/htdocs/langs/en_US/install.lang +++ b/htdocs/langs/en_US/install.lang @@ -158,7 +158,6 @@ ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert ######### # upgrade -######### MigrationFixData=Fix for denormalized data MigrationOrder=Data migration for customer's orders MigrationSupplierOrder=Data migration for supplier's orders diff --git a/htdocs/langs/en_US/interventions.lang b/htdocs/langs/en_US/interventions.lang index 7f91361ed22..58579a74276 100644 --- a/htdocs/langs/en_US/interventions.lang +++ b/htdocs/langs/en_US/interventions.lang @@ -39,4 +39,4 @@ ArcticNumRefModelError=Failed to activate PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module. PrintProductsOnFichinter=Print products on intervention card -PrintProductsOnFichinterDetails=forinterventions generated from orders \ No newline at end of file +PrintProductsOnFichinterDetails=forinterventions generated from orders diff --git a/htdocs/langs/en_US/ldap.lang b/htdocs/langs/en_US/ldap.lang index 0342249487e..02e457446a6 100644 --- a/htdocs/langs/en_US/ldap.lang +++ b/htdocs/langs/en_US/ldap.lang @@ -26,4 +26,4 @@ GroupSynchronized=Group synchronized MemberSynchronized=Member synchronized ContactSynchronized=Contact synchronized ForceSynchronize=Force synchronizing Dolibarr -> LDAP -ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility. \ No newline at end of file +ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility. diff --git a/htdocs/langs/en_US/mailmanspip.lang b/htdocs/langs/en_US/mailmanspip.lang index e0f26eeb4a1..c85b3d60db2 100644 --- a/htdocs/langs/en_US/mailmanspip.lang +++ b/htdocs/langs/en_US/mailmanspip.lang @@ -24,4 +24,4 @@ DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP DeleteIntoSpipError=Failed to suppress the user from SPIP SPIPConnectionFailed=Failed to connect to SPIP SuccessToAddToMailmanList=Add of %s to mailman list %s or SPIP database done -SuccessToRemoveToMailmanList=Removal of %s from mailman list %s or SPIP database done \ No newline at end of file +SuccessToRemoveToMailmanList=Removal of %s from mailman list %s or SPIP database done diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang index df4aef6459e..78d59e4c93d 100644 --- a/htdocs/langs/en_US/mails.lang +++ b/htdocs/langs/en_US/mails.lang @@ -99,8 +99,6 @@ MailingModuleDescContactsByCompanyCategory=Contacts/addresses of third parties ( MailingModuleDescContactsByCategory=Contacts/addresses of third parties by category MailingModuleDescMembersCategories=Foundation members (by categories) MailingModuleDescContactsByFunction=Contacts/addresses of third parties (by position/function) - - LineInFile=Line %s in file RecipientSelectionModules=Defined requests for recipient's selection MailSelectedRecipients=Selected recipients @@ -128,7 +126,6 @@ TagCheckMail=Track mail opening TagUnsubscribe=Unsubscribe link TagSignature=Signature sending user TagMailtoEmail=Recipient EMail - # Module Notifications Notifications=Notifications NoNotificationsWillBeSent=No email notifications are planned for this event and company diff --git a/htdocs/langs/en_US/margins.lang b/htdocs/langs/en_US/margins.lang index e8d5fed1af9..3fca6d7a644 100644 --- a/htdocs/langs/en_US/margins.lang +++ b/htdocs/langs/en_US/margins.lang @@ -10,24 +10,18 @@ MarkRate=Mark rate DisplayMarginRates=Display margin rates DisplayMarkRates=Display mark rates InputPrice=Input price - margin=Profit margins management margesSetup=Profit margins management setup - MarginDetails=Margin details - ProductMargins=Product margins CustomerMargins=Customer margins SalesRepresentativeMargins=Sales representative margins - ProductService=Product or Service AllProducts=All products and services ChooseProduct/Service=Choose product or service - StartDate=Start date EndDate=End date Launch=Start - ForceBuyingPriceIfNull=Force buying price if null ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0) MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts @@ -35,16 +29,13 @@ UseDiscountAsProduct=As a product UseDiscountAsService=As a service UseDiscountOnTotal=On subtotal MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation. - MARGIN_TYPE=Margin type MargeBrute=Raw margin MargeNette=Net margin MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price
Net margin : Selling price - Cost price - CostPrice=Cost price BuyingCost=Cost price UnitCharges=Unit charges Charges=Charges - AgentContactType=Commercial agent contact type AgentContactTypeDetails=Défine what contact type (linked on invoices) will be used for margin report by commercial agents diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang index 5c12d9c3aa3..6b7abb382ba 100644 --- a/htdocs/langs/en_US/members.lang +++ b/htdocs/langs/en_US/members.lang @@ -86,7 +86,6 @@ SubscriptionNotReceivedShort=Never received ListOfSubscriptions=List of subscriptions SendCardByMail=Send card by Email AddMember=Add member -MemberType=Member type NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types" NewMemberType=New member type WelcomeEMail=Welcome e-mail diff --git a/htdocs/langs/en_US/opensurvey.lang b/htdocs/langs/en_US/opensurvey.lang index 3b34bd661c7..4ae116d4c33 100644 --- a/htdocs/langs/en_US/opensurvey.lang +++ b/htdocs/langs/en_US/opensurvey.lang @@ -63,4 +63,4 @@ ErrorOpenSurveyDateFormat=Date must have the format YYYY-MM-DD ErrorInsertingComment=There was an error while inserting your comment MoreChoices=Enter more choices for the voters SurveyExpiredInfo=The voting time of this poll has expired. -EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s \ No newline at end of file +EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang index ad29ce6eb86..d50f8615dc8 100644 --- a/htdocs/langs/en_US/orders.lang +++ b/htdocs/langs/en_US/orders.lang @@ -101,7 +101,6 @@ RelatedOrders=Related orders OnProcessOrders=In process orders RefOrder=Ref. order RefCustomerOrder=Ref. customer order -CustomerOrder=Customer order RefCustomerOrderShort=Ref. cust. order SendOrderByMail=Send order by mail ActionsOnOrder=Events on order @@ -132,8 +131,6 @@ Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s' Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s' Error_OrderNotChecked=No orders to invoice selected - - # Sources OrderSource0=Commercial proposal OrderSource1=Internet @@ -144,7 +141,6 @@ OrderSource5=Commercial OrderSource6=Store QtyOrdered=Qty ordered AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order - # Documents models PDFEinsteinDescription=A complete order model (logo...) PDFEdisonDescription=A simple order model @@ -155,7 +151,6 @@ OrderByFax=Fax OrderByEMail=EMail OrderByWWW=Online OrderByPhone=Phone - CreateInvoiceForThisCustomer=Bill orders NoOrdersToInvoice=No orders billable CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. @@ -165,4 +160,4 @@ Ordered=Ordered OrderCreated=Your orders have been created OrderFail=An error happened during your orders creation CreateOrders=Create orders -ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". \ No newline at end of file +ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". diff --git a/htdocs/langs/en_US/paypal.lang b/htdocs/langs/en_US/paypal.lang index 76de83bba17..64602c96aa8 100644 --- a/htdocs/langs/en_US/paypal.lang +++ b/htdocs/langs/en_US/paypal.lang @@ -19,4 +19,4 @@ PredefinedMailContentLink=You can click on the secure link below to make your pa YouAreCurrentlyInSandboxMode=You are currently in the "sandbox" mode NewPaypalPaymentReceived=New Paypal payment received NewPaypalPaymentFailed=New Paypal payment tried but failed -PAYPAL_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not) \ No newline at end of file +PAYPAL_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not) diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang index 802ada84a54..7ae2bbddd51 100644 --- a/htdocs/langs/en_US/products.lang +++ b/htdocs/langs/en_US/products.lang @@ -226,4 +226,4 @@ PriceCatalogue=Catalogue Price PricingRule=Pricing Rules AddCustomerPrice=Add price by customers ForceUpdateChildPriceSoc=Set same price on customer subsidiaries -PriceByCustomerLog=Price by customer log \ No newline at end of file +PriceByCustomerLog=Price by customer log diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang index b29a7281575..039d47f6aa9 100644 --- a/htdocs/langs/en_US/sendings.lang +++ b/htdocs/langs/en_US/sendings.lang @@ -66,11 +66,9 @@ CarrierList=List of transporters SendingMethodCATCH=Catch by customer SendingMethodTRANS=Transporter SendingMethodCOLSUI=Colissimo - # ModelDocument DocumentModelSirocco=Simple document model for delivery receipts DocumentModelTyphon=More complete document model for delivery receipts (logo...) - Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined SumOfProductVolumes=Sum of product volumes -SumOfProductWeights=Sum of product weights \ No newline at end of file +SumOfProductWeights=Sum of product weights diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang index 032412cc322..75abbff413a 100644 --- a/htdocs/langs/en_US/stocks.lang +++ b/htdocs/langs/en_US/stocks.lang @@ -116,4 +116,4 @@ MassStockMovement=Mass stock movement SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s". RecordMovement=Record transfert ReceivingForSameOrder=Receivings for this order -StockMovementRecorded=Stock movements recorded \ No newline at end of file +StockMovementRecorded=Stock movements recorded diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang index 3561fd3e57e..fdc0787646a 100644 --- a/htdocs/langs/en_US/suppliers.lang +++ b/htdocs/langs/en_US/suppliers.lang @@ -39,4 +39,4 @@ AddSupplierOrder=Create supplier order AddSupplierInvoice=Create supplier invoice ListOfSupplierProductForSupplier=List of products and prices for supplier %s NoneOrBatchFileNeverRan=None or batch %s not ran recently -SentToSuppliers=Sent to suppliers \ No newline at end of file +SentToSuppliers=Sent to suppliers diff --git a/htdocs/langs/en_US/trips.lang b/htdocs/langs/en_US/trips.lang index 3c9c91eda79..06d46c7ac65 100644 --- a/htdocs/langs/en_US/trips.lang +++ b/htdocs/langs/en_US/trips.lang @@ -18,4 +18,4 @@ TF_LUNCH=Lunch TF_TRIP=Trip ListTripsAndExpenses=List of trips and expenses ExpensesArea=Trips and expenses area -SearchATripAndExpense=Search a trip and expense \ No newline at end of file +SearchATripAndExpense=Search a trip and expense diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang index 2c797b7ac97..06c595e6391 100644 --- a/htdocs/langs/en_US/users.lang +++ b/htdocs/langs/en_US/users.lang @@ -117,4 +117,4 @@ HierarchicalResponsible=Hierarchical responsible HierarchicView=Hierarchical view UseTypeFieldToChange=Use field Type to change OpenIDURL=OpenID URL -LoginUsingOpenID=Use OpenID to login \ No newline at end of file +LoginUsingOpenID=Use OpenID to login From 09b6ccbe58aa0bf47b3c5318bf1927f8764a86fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Wed, 26 Mar 2014 18:19:31 +0100 Subject: [PATCH 09/13] Qual: generic shebang --- dev/deduplicatefilelinesrecursively.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/deduplicatefilelinesrecursively.sh b/dev/deduplicatefilelinesrecursively.sh index 2aaa05c0934..ad64e546829 100755 --- a/dev/deduplicatefilelinesrecursively.sh +++ b/dev/deduplicatefilelinesrecursively.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Recursively deduplicate file lines on a per file basis # Useful to deduplicate language files # From 800067a478fcbbceeec0f45e222e3e5d36e59b01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Wed, 26 Mar 2014 19:16:26 +0100 Subject: [PATCH 10/13] Added a dev script to help identify duplicate translation keys in language files --- dev/detectduplicatelangkey.sh | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100755 dev/detectduplicatelangkey.sh diff --git a/dev/detectduplicatelangkey.sh b/dev/detectduplicatelangkey.sh new file mode 100755 index 00000000000..06d9cd8a69e --- /dev/null +++ b/dev/detectduplicatelangkey.sh @@ -0,0 +1,21 @@ +#!/bin/sh +# Helps find duplicate translation keys in language files +# +# Copyright (C) 2014 Raphaël Doursenaud - rdoursenaud@gpcsolutions.fr + +for file in `find . -type f` +do + dupes=$( + sed "s/^\s*//" "$file" | # Remove any leading whitespace + sed "s/\s*\=/=/" | # Remove any whitespace before = + grep -Po "(^.*?)=" | # Non greedeely match everything before = + sed "s/\=//" | # Remove trailing = so we get the key + sort | uniq -d # Find duplicates + ) + + if [ -n "$dupes" ] + then + echo "Duplicates found in $file" + echo "$dupes" + fi +done From 5acfb5adc7de2554ee1b5cd69a1fdee95a16d440 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 27 Mar 2014 11:30:57 +0100 Subject: [PATCH 11/13] Langs: removed duplicate key --- htdocs/langs/en_US/other.lang | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang index 4621c9f40ec..40f80f875cb 100644 --- a/htdocs/langs/en_US/other.lang +++ b/htdocs/langs/en_US/other.lang @@ -24,7 +24,6 @@ Notify_ORDER_SENTBYMAIL=Customer order sent by mail Notify_COMPANY_CREATE=Third party created Notify_COMPANY_SENTBYMAIL=Mails sent from third party card Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail -Notify_ORDER_SENTBYMAIL=Envío pedido por e-mail Notify_BILL_PAYED=Customer invoice payed Notify_BILL_CANCEL=Customer invoice canceled Notify_BILL_SENTBYMAIL=Customer invoice sent by mail From 771f205d2a5686c0fb519f3b6d4f43d2afd0bd1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 27 Mar 2014 11:37:40 +0100 Subject: [PATCH 12/13] Langs: added translation string for action triggers that were missing --- htdocs/langs/en_US/other.lang | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang index 40f80f875cb..3dd04bd70a2 100644 --- a/htdocs/langs/en_US/other.lang +++ b/htdocs/langs/en_US/other.lang @@ -17,6 +17,8 @@ Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused Notify_ORDER_VALIDATE=Customer order validated Notify_PROPAL_VALIDATE=Customer proposal validated +Notify_PROPAL_CLOSE_SIGNED=Customer propal closed signed +Notify_PROPAL_CLOSE_REFUSED=Customer propal closed refused Notify_WITHDRAW_TRANSMIT=Transmission withdrawal Notify_WITHDRAW_CREDIT=Credit withdrawal Notify_WITHDRAW_EMIT=Perform withdrawal @@ -32,11 +34,13 @@ Notify_ORDER_SUPPLIER_SENTBYMAIL=Supplier order sent by mail Notify_BILL_SUPPLIER_VALIDATE=Supplier invoice validated Notify_BILL_SUPPLIER_PAYED=Supplier invoice payed Notify_BILL_SUPPLIER_SENTBYMAIL=Supplier invoice sent by mail +Notify_BILL_SUPPLIER_CANCELED=Supplier invoce cancelled Notify_CONTRACT_VALIDATE=Contract validated Notify_FICHEINTER_VALIDATE=Intervention validated Notify_SHIPPING_VALIDATE=Shipping validated Notify_SHIPPING_SENTBYMAIL=Shipping sent by mail Notify_MEMBER_VALIDATE=Member validated +Notify_MEMBER_MODIFY=Member modified Notify_MEMBER_SUBSCRIPTION=Member subscribed Notify_MEMBER_RESILIATE=Member resiliated Notify_MEMBER_DELETE=Member deleted From ab623e3ff1fa4abcf0e852d76b8fc454a2648e63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Mon, 31 Mar 2014 14:21:23 +0200 Subject: [PATCH 13/13] Fixed 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 3dd04bd70a2..1e8c9bcfe8b 100644 --- a/htdocs/langs/en_US/other.lang +++ b/htdocs/langs/en_US/other.lang @@ -34,7 +34,7 @@ Notify_ORDER_SUPPLIER_SENTBYMAIL=Supplier order sent by mail Notify_BILL_SUPPLIER_VALIDATE=Supplier invoice validated Notify_BILL_SUPPLIER_PAYED=Supplier invoice payed Notify_BILL_SUPPLIER_SENTBYMAIL=Supplier invoice sent by mail -Notify_BILL_SUPPLIER_CANCELED=Supplier invoce cancelled +Notify_BILL_SUPPLIER_CANCELED=Supplier invoice cancelled Notify_CONTRACT_VALIDATE=Contract validated Notify_FICHEINTER_VALIDATE=Intervention validated Notify_SHIPPING_VALIDATE=Shipping validated