diff --git a/htdocs/core/modules/modImport.class.php b/htdocs/core/modules/modImport.class.php index 01d66644dc7..ffaac0bf29e 100644 --- a/htdocs/core/modules/modImport.class.php +++ b/htdocs/core/modules/modImport.class.php @@ -60,9 +60,11 @@ class modImport extends DolibarrModules $this->config_page_url = array(); // Dependencies - $this->depends = array(); - $this->requiredby = array(); - $this->phpmin = array(4,3,0); // Need auto_detect_line_endings php option to solve MAC pbs. + $this->hidden = false; // A condition to hide module + $this->depends = array(); // List of module class names as string that must be enabled if this module is enabled + $this->requiredby = array(); // List of module ids to disable if this one is disabled + $this->conflictwith = array(); // List of module class names as string this module is in conflict with + $this->phpmin = array(5,4); // Minimum version of PHP required by module - Need auto_detect_line_endings php option to solve MAC pbs. $this->phpmax = array(); $this->need_dolibarr_version = array(2,7,-1); // Minimum version of Dolibarr required by module $this->need_javascript_ajax = 1; diff --git a/htdocs/core/modules/modIncoterm.class.php b/htdocs/core/modules/modIncoterm.class.php index 7d4d1251f31..95949eeb05a 100644 --- a/htdocs/core/modules/modIncoterm.class.php +++ b/htdocs/core/modules/modIncoterm.class.php @@ -65,9 +65,11 @@ class modIncoterm extends DolibarrModules $this->config_page_url = array(); // Dependencies - $this->depends = array(); // List of modules id that must be enabled if this module is enabled - $this->requiredby = array(); // List of modules id to disable if this one is disabled - $this->phpmin = array(5,0); // Minimum version of PHP required by module + $this->hidden = false; // A condition to hide module + $this->depends = array(); // List of module class names as string that must be enabled if this module is enabled + $this->requiredby = array(); // List of module ids to disable if this one is disabled + $this->conflictwith = array(); // List of module class names as string this module is in conflict with + $this->phpmin = array(5,4); // Minimum version of PHP required by module $this->need_dolibarr_version = array(3,0); // Minimum version of Dolibarr required by module $this->langfiles = array("incoterm"); diff --git a/htdocs/core/modules/modLabel.class.php b/htdocs/core/modules/modLabel.class.php index 2d91fd121bb..563dddca3cc 100644 --- a/htdocs/core/modules/modLabel.class.php +++ b/htdocs/core/modules/modLabel.class.php @@ -56,9 +56,12 @@ class modLabel extends DolibarrModules // Data directories to create when module is enabled $this->dirs = array("/label/temp"); - // Dependancies - $this->depends = array(); - $this->requiredby = array(); + // Dependencies + $this->hidden = false; // A condition to hide module + $this->depends = array(); // List of module class names as string that must be enabled if this module is enabled + $this->requiredby = array(); // List of module ids to disable if this one is disabled + $this->conflictwith = array(); // List of module class names as string this module is in conflict with + $this->phpmin = array(5,4); // Minimum version of PHP required by module // Config pages // $this->config_page_url = array("label.php"); diff --git a/htdocs/core/modules/modLdap.class.php b/htdocs/core/modules/modLdap.class.php index 0f183bd6c76..90577ae3ccf 100644 --- a/htdocs/core/modules/modLdap.class.php +++ b/htdocs/core/modules/modLdap.class.php @@ -60,9 +60,12 @@ class modLdap extends DolibarrModules // Config pages $this->config_page_url = array("ldap.php"); - // Dependancies - $this->depends = array(); - $this->requiredby = array(); + // Dependencies + $this->hidden = false; // A condition to hide module + $this->depends = array(); // List of module class names as string that must be enabled if this module is enabled + $this->requiredby = array(); // List of module ids to disable if this one is disabled + $this->conflictwith = array(); // List of module class names as string this module is in conflict with + $this->phpmin = array(5,4); // Minimum version of PHP required by module // Constants $this->const = array( diff --git a/htdocs/core/modules/modLoan.class.php b/htdocs/core/modules/modLoan.class.php index 51779f6ffc5..70386a1647a 100644 --- a/htdocs/core/modules/modLoan.class.php +++ b/htdocs/core/modules/modLoan.class.php @@ -63,9 +63,11 @@ class modLoan extends DolibarrModules $this->config_page_url = array('loan.php'); // Dependencies - $this->depends = array(); - $this->requiredby = array(); - $this->conflictwith = array(); + $this->hidden = false; // A condition to hide module + $this->depends = array(); // List of module class names as string that must be enabled if this module is enabled + $this->requiredby = array(); // List of module ids to disable if this one is disabled + $this->conflictwith = array(); // List of module class names as string this module is in conflict with + $this->phpmin = array(5,4); // Minimum version of PHP required by module $this->langfiles = array("loan"); // Constants diff --git a/htdocs/core/modules/modMailing.class.php b/htdocs/core/modules/modMailing.class.php index 46b31a08696..062b9113e76 100644 --- a/htdocs/core/modules/modMailing.class.php +++ b/htdocs/core/modules/modMailing.class.php @@ -57,8 +57,11 @@ class modMailing extends DolibarrModules $this->dirs = array("/mailing/temp"); // Dependencies - $this->depends = array(); - $this->requiredby = array(); + $this->hidden = false; // A condition to hide module + $this->depends = array(); // List of module class names as string that must be enabled if this module is enabled + $this->requiredby = array(); // List of module ids to disable if this one is disabled + $this->conflictwith = array(); // List of module class names as string this module is in conflict with + $this->phpmin = array(5,4); // Minimum version of PHP required by module $this->langfiles = array("mails"); // Config pages diff --git a/htdocs/core/modules/modMailmanSpip.class.php b/htdocs/core/modules/modMailmanSpip.class.php index 9a019db7fea..8403147fd74 100644 --- a/htdocs/core/modules/modMailmanSpip.class.php +++ b/htdocs/core/modules/modMailmanSpip.class.php @@ -58,8 +58,11 @@ class modMailmanSpip extends DolibarrModules $this->dirs = array(); // Dependencies - $this->depends = array('modAdherent'); - $this->requiredby = array(); + $this->hidden = false; // A condition to hide module + $this->depends = array('modAdherent'); // List of module class names as string that must be enabled if this module is enabled + $this->requiredby = array(); // List of module ids to disable if this one is disabled + $this->conflictwith = array(); // List of module class names as string this module is in conflict with + $this->phpmin = array(5,4); // Minimum version of PHP required by module // Config pages $this->config_page_url = array('mailman.php'); diff --git a/htdocs/core/modules/modMargin.class.php b/htdocs/core/modules/modMargin.class.php index 53fba120656..4eb9ec7fb65 100644 --- a/htdocs/core/modules/modMargin.class.php +++ b/htdocs/core/modules/modMargin.class.php @@ -68,9 +68,11 @@ class modMargin extends DolibarrModules $this->config_page_url = array("margin.php@margin"); // Dependencies - $this->depends = array("modPropale", "modProduct"); // List of modules id that must be enabled if this module is enabled - $this->requiredby = array(); // List of modules id to disable if this one is disabled - $this->phpmin = array(5,1); // Minimum version of PHP required by module + $this->hidden = false; // A condition to hide module + $this->depends = array("modPropale", "modProduct"); // List of module class names as string that must be enabled if this module is enabled + $this->requiredby = array(); // List of module ids to disable if this one is disabled + $this->conflictwith = array(); // List of module class names as string this module is in conflict with + $this->phpmin = array(5,4); // Minimum version of PHP required by module $this->need_dolibarr_version = array(3,2); // Minimum version of Dolibarr required by module $this->langfiles = array("margins"); diff --git a/htdocs/core/modules/modModuleBuilder.class.php b/htdocs/core/modules/modModuleBuilder.class.php index 875820c9b6b..60afb99afc5 100644 --- a/htdocs/core/modules/modModuleBuilder.class.php +++ b/htdocs/core/modules/modModuleBuilder.class.php @@ -62,7 +62,7 @@ class modModuleBuilder extends DolibarrModules //------------- $this->config_page_url = array('setup@modulebuilder'); - // Dependancies + // Dependencies //------------- $this->hidden = false; // A condition to disable module $this->depends = array(); // List of modules id that must be enabled if this module is enabled diff --git a/htdocs/core/modules/modMultiCurrency.class.php b/htdocs/core/modules/modMultiCurrency.class.php index 2d443c2e7bb..b19c018b0d9 100644 --- a/htdocs/core/modules/modMultiCurrency.class.php +++ b/htdocs/core/modules/modMultiCurrency.class.php @@ -88,7 +88,7 @@ class modMultiCurrency extends DolibarrModules $this->depends = array(); // List of modules id that must be enabled if this module is enabled $this->requiredby = array(); // List of modules id to disable if this one is disabled $this->conflictwith = array(); // List of modules id this module is in conflict with - $this->phpmin = array(5, 0); // Minimum version of PHP required by module + $this->phpmin = array(5, 4); // Minimum version of PHP required by module $this->need_dolibarr_version = array(3, 0); // Minimum version of Dolibarr required by module $this->langfiles = array("multicurrency"); diff --git a/htdocs/core/modules/modNotification.class.php b/htdocs/core/modules/modNotification.class.php index cc016d294b5..9dbd77fae86 100644 --- a/htdocs/core/modules/modNotification.class.php +++ b/htdocs/core/modules/modNotification.class.php @@ -55,8 +55,11 @@ class modNotification extends DolibarrModules $this->dirs = array(); // Dependencies - $this->depends = array(); - $this->requiredby = array(); + $this->hidden = false; // A condition to hide module + $this->depends = array(); // List of module class names as string that must be enabled if this module is enabled + $this->requiredby = array(); // List of module ids to disable if this one is disabled + $this->conflictwith = array(); // List of module class names as string this module is in conflict with + $this->phpmin = array(5,4); // Minimum version of PHP required by module $this->langfiles = array("mails"); // Config pages diff --git a/htdocs/core/modules/modOauth.class.php b/htdocs/core/modules/modOauth.class.php index 3177e41e787..3f2ecc0ac72 100644 --- a/htdocs/core/modules/modOauth.class.php +++ b/htdocs/core/modules/modOauth.class.php @@ -67,9 +67,11 @@ class modOauth extends DolibarrModules $this->config_page_url = array("oauth.php"); // Dependencies - $this->depends = array(); - $this->requiredby = array(); - $this->phpmin = array(5,1); // Minimum version of PHP required by module + $this->hidden = false; // A condition to hide module + $this->depends = array(); // List of module class names as string that must be enabled if this module is enabled + $this->requiredby = array(); // List of module ids to disable if this one is disabled + $this->conflictwith = array(); // List of module class names as string this module is in conflict with + $this->phpmin = array(5,4); // Minimum version of PHP required by module // Minimum version of PHP required by module $this->need_dolibarr_version = array(3,7,-2); // Minimum version of Dolibarr required by module $this->conflictwith = array(); $this->langfiles = array("oauth"); diff --git a/htdocs/core/modules/modOpenSurvey.class.php b/htdocs/core/modules/modOpenSurvey.class.php index fcee9f585aa..23c1b2680b8 100644 --- a/htdocs/core/modules/modOpenSurvey.class.php +++ b/htdocs/core/modules/modOpenSurvey.class.php @@ -72,9 +72,11 @@ class modOpenSurvey extends DolibarrModules //$this->dirs[1] = DOL_DATA_ROOT.'/mymodule/temp; // Dependencies - $this->depends = array(); // List of modules id that must be enabled if this module is enabled - $this->requiredby = array(); // List of modules id to disable if this one is disabled - $this->phpmin = array(4,1); // Minimum version of PHP required by module + $this->hidden = false; // A condition to hide module + $this->depends = array(); // List of module class names as string that must be enabled if this module is enabled + $this->requiredby = array(); // List of module ids to disable if this one is disabled + $this->conflictwith = array(); // List of module class names as string this module is in conflict with + $this->phpmin = array(5,4); // Minimum version of PHP required by module $this->need_dolibarr_version = array(3,4,0); // Minimum version of Dolibarr required by module // Constants diff --git a/htdocs/core/modules/modPaybox.class.php b/htdocs/core/modules/modPaybox.class.php index 727e6723ce2..ba7851aad4a 100644 --- a/htdocs/core/modules/modPaybox.class.php +++ b/htdocs/core/modules/modPaybox.class.php @@ -69,9 +69,11 @@ class modPayBox extends DolibarrModules $this->config_page_url = array("paybox.php@paybox"); // Dependencies - $this->depends = array(); // List of modules id that must be enabled if this module is enabled - $this->requiredby = array(); // List of modules id to disable if this one is disabled - $this->phpmin = array(4,1); // Minimum version of PHP required by module + $this->hidden = false; // A condition to hide module + $this->depends = array(); // List of module class names as string that must be enabled if this module is enabled + $this->requiredby = array(); // List of module ids to disable if this one is disabled + $this->conflictwith = array(); // List of module class names as string this module is in conflict with + $this->phpmin = array(5,4); // Minimum version of PHP required by module $this->need_dolibarr_version = array(2,6); // Minimum version of Dolibarr required by module $this->langfiles = array("paybox"); diff --git a/htdocs/core/modules/modPaypal.class.php b/htdocs/core/modules/modPaypal.class.php index e713685691c..a11fa41b7a6 100644 --- a/htdocs/core/modules/modPaypal.class.php +++ b/htdocs/core/modules/modPaypal.class.php @@ -70,9 +70,11 @@ class modPaypal extends DolibarrModules $this->config_page_url = array("paypal.php@paypal"); // Dependencies - $this->depends = array(); // List of modules id that must be enabled if this module is enabled - $this->requiredby = array('modPaypalPlus'); // List of modules id to disable if this one is disabled - $this->phpmin = array(5,2); // Minimum version of PHP required by module + $this->hidden = false; // A condition to hide module + $this->depends = array(); // List of module class names as string that must be enabled if this module is enabled + $this->requiredby = array('modPaypalPlus'); // List of module ids to disable if this one is disabled + $this->conflictwith = array(); // List of module class names as string this module is in conflict with + $this->phpmin = array(5,4); // Minimum version of PHP required by module $this->need_dolibarr_version = array(3,0); // Minimum version of Dolibarr required by module $this->langfiles = array("paypal"); diff --git a/htdocs/core/modules/modPrelevement.class.php b/htdocs/core/modules/modPrelevement.class.php index 4d91c937d99..cc74273d29c 100644 --- a/htdocs/core/modules/modPrelevement.class.php +++ b/htdocs/core/modules/modPrelevement.class.php @@ -63,9 +63,12 @@ class modPrelevement extends DolibarrModules // Data directories to create when module is enabled $this->dirs = array("/prelevement/temp","/prelevement/receipts"); - // Dependancies - $this->depends = array("modFacture","modBanque"); - $this->requiredby = array(); + // Dependencies + $this->hidden = false; // A condition to hide module + $this->depends = array("modFacture","modBanque"); // List of module class names as string that must be enabled if this module is enabled + $this->requiredby = array(); // List of module ids to disable if this one is disabled + $this->conflictwith = array(); // List of module class names as string this module is in conflict with + $this->phpmin = array(5,4); // Minimum version of PHP required by module // Config pages $this->config_page_url = array("prelevement.php"); diff --git a/htdocs/core/modules/modPrinting.class.php b/htdocs/core/modules/modPrinting.class.php index 1aa36bdacce..17d2f398e2b 100644 --- a/htdocs/core/modules/modPrinting.class.php +++ b/htdocs/core/modules/modPrinting.class.php @@ -66,9 +66,11 @@ class modPrinting extends DolibarrModules $this->config_page_url = array("printing.php@printing"); // Dependencies - $this->depends = array(); - $this->requiredby = array(); - $this->phpmin = array(5,1); // Minimum version of PHP required by module + $this->hidden = false; // A condition to hide module + $this->depends = array(); // List of module class names as string that must be enabled if this module is enabled + $this->requiredby = array(); // List of module ids to disable if this one is disabled + $this->conflictwith = array(); // List of module class names as string this module is in conflict with + $this->phpmin = array(5,4); // Minimum version of PHP required by module $this->need_dolibarr_version = array(3,7,-2); // Minimum version of Dolibarr required by module $this->conflictwith = array(); $this->langfiles = array("printing"); diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php index 6ad67ac089c..ab62edc00f6 100644 --- a/htdocs/core/modules/modProduct.class.php +++ b/htdocs/core/modules/modProduct.class.php @@ -65,8 +65,11 @@ class modProduct extends DolibarrModules $this->dirs = array("/product/temp"); // Dependencies - $this->depends = array(); - $this->requiredby = array("modStock","modBarcode","modProductBatch"); + $this->hidden = false; // A condition to hide module + $this->depends = array(); // List of module class names as string that must be enabled if this module is enabled + $this->requiredby = array("modStock","modBarcode","modProductBatch"); // List of module ids to disable if this one is disabled + $this->conflictwith = array(); // List of module class names as string this module is in conflict with + $this->phpmin = array(5,4); // Minimum version of PHP required by module // Config pages $this->config_page_url = array("product.php@product"); diff --git a/htdocs/core/modules/modProductBatch.class.php b/htdocs/core/modules/modProductBatch.class.php index 91e8ddbae3c..ac968233772 100644 --- a/htdocs/core/modules/modProductBatch.class.php +++ b/htdocs/core/modules/modProductBatch.class.php @@ -68,9 +68,11 @@ class modProductBatch extends DolibarrModules $this->config_page_url = array("product_lot_extrafields.php@product"); // Dependencies - $this->depends = array("modProduct","modStock","modExpedition","modFournisseur"); // List of modules id that must be enabled if this module is enabled. modExpedition is required to manage batch exit (by manual stock decrease on shipment), modSupplier to manage batch entry (after supplier order). - $this->requiredby = array(); // List of modules id to disable if this one is disabled - $this->phpmin = array(5,0); // Minimum version of PHP required by module + $this->hidden = false; // A condition to hide module + $this->depends = array("modProduct","modStock","modExpedition","modFournisseur"); // List of module class names as string that must be enabled if this module is enabled + $this->requiredby = array(); // List of module ids to disable if this one is disabled + $this->conflictwith = array(); // List of module class names as string this module is in conflict with + $this->phpmin = array(5,4); // Minimum version of PHP required by module $this->need_dolibarr_version = array(3,0); // Minimum version of Dolibarr required by module $this->langfiles = array("productbatch"); diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php index d38fc743de1..3e440d3330a 100644 --- a/htdocs/core/modules/modProjet.class.php +++ b/htdocs/core/modules/modProjet.class.php @@ -64,10 +64,12 @@ class modProjet extends DolibarrModules // Data directories to create when module is enabled $this->dirs = array("/projet/temp"); - // Dependancies - $this->depends = array(); - $this->requiredby = array(); - $this->conflictwith = array(); + // Dependencies + $this->hidden = false; // A condition to hide module + $this->depends = array(); // List of module class names as string that must be enabled if this module is enabled + $this->requiredby = array(); // List of module ids to disable if this one is disabled + $this->conflictwith = array(); // List of module class names as string this module is in conflict with + $this->phpmin = array(5,4); // Minimum version of PHP required by module $this->langfiles = array('projects'); // Constants diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php index c0701d3bfe2..5b3b2fdd4d8 100644 --- a/htdocs/core/modules/modPropale.class.php +++ b/htdocs/core/modules/modPropale.class.php @@ -63,9 +63,12 @@ class modPropale extends DolibarrModules // Data directories to create when module is enabled $this->dirs = array("/propale/temp"); - // Dependancies - $this->depends = array("modSociete"); - $this->requiredby = array(); + // Dependencies + $this->hidden = false; // A condition to hide module + $this->depends = array("modSociete"); // List of module class names as string that must be enabled if this module is enabled + $this->requiredby = array(); // List of module ids to disable if this one is disabled + $this->conflictwith = array(); // List of module class names as string this module is in conflict with + $this->phpmin = array(5,4); // Minimum version of PHP required by module $this->config_page_url = array("propal.php"); $this->langfiles = array("propal","bills","companies","deliveries","products"); diff --git a/htdocs/core/modules/modReceiptPrinter.class.php b/htdocs/core/modules/modReceiptPrinter.class.php index 19df7ca0726..77f264f0d52 100644 --- a/htdocs/core/modules/modReceiptPrinter.class.php +++ b/htdocs/core/modules/modReceiptPrinter.class.php @@ -67,9 +67,11 @@ class modReceiptPrinter extends DolibarrModules $this->config_page_url = array("receiptprinter.php"); // Dependencies - $this->depends = array(); - $this->requiredby = array(); - $this->phpmin = array(5,1); // Minimum version of PHP required by module + $this->hidden = false; // A condition to hide module + $this->depends = array(); // List of module class names as string that must be enabled if this module is enabled + $this->requiredby = array(); // List of module ids to disable if this one is disabled + $this->conflictwith = array(); // List of module class names as string this module is in conflict with + $this->phpmin = array(5,4); // Minimum version of PHP required by module $this->need_dolibarr_version = array(3,9,-2); // Minimum version of Dolibarr required by module $this->conflictwith = array(); $this->langfiles = array("receiptprinter"); diff --git a/htdocs/core/modules/modResource.class.php b/htdocs/core/modules/modResource.class.php index 15b414947ef..b088a301c6b 100644 --- a/htdocs/core/modules/modResource.class.php +++ b/htdocs/core/modules/modResource.class.php @@ -95,7 +95,7 @@ class modResource extends DolibarrModules // List of modules id to disable if this one is disabled $this->requiredby = array('modPlace'); // Minimum version of PHP required by module - $this->phpmin = array(5, 3); + $this->phpmin = array(5, 4); $this->langfiles = array("resource"); // langfiles@resource // Constants diff --git a/htdocs/core/modules/modSalaries.class.php b/htdocs/core/modules/modSalaries.class.php index e3d418d182e..9e319c8bf41 100644 --- a/htdocs/core/modules/modSalaries.class.php +++ b/htdocs/core/modules/modSalaries.class.php @@ -70,9 +70,11 @@ class modSalaries extends DolibarrModules $this->config_page_url = array(); // Dependencies - $this->depends = array(); - $this->requiredby = array(); - $this->conflictwith = array(); + $this->hidden = false; // A condition to hide module + $this->depends = array(); // List of module class names as string that must be enabled if this module is enabled + $this->requiredby = array(); // List of module ids to disable if this one is disabled + $this->conflictwith = array(); // List of module class names as string this module is in conflict with + $this->phpmin = array(5,4); // Minimum version of PHP required by module $this->langfiles = array("salaries","bills"); // Constants diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php index df09d27ca51..6db325f8f55 100644 --- a/htdocs/core/modules/modService.class.php +++ b/htdocs/core/modules/modService.class.php @@ -62,9 +62,12 @@ class modService extends DolibarrModules // Data directories to create when module is enabled $this->dirs = array("/product/temp"); - // Dependancies - $this->depends = array(); - $this->requiredby = array(); + // Dependencies + $this->hidden = false; // A condition to hide module + $this->depends = array(); // List of module class names as string that must be enabled if this module is enabled + $this->requiredby = array(); // List of module ids to disable if this one is disabled + $this->conflictwith = array(); // List of module class names as string this module is in conflict with + $this->phpmin = array(5,4); // Minimum version of PHP required by module // Config pages $this->config_page_url = array("product.php@product"); diff --git a/htdocs/core/modules/modSkype.class.php b/htdocs/core/modules/modSkype.class.php index d84520318a3..84a55ac365f 100644 --- a/htdocs/core/modules/modSkype.class.php +++ b/htdocs/core/modules/modSkype.class.php @@ -25,7 +25,7 @@ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; /** - * Class to describe a Cron module + * Class to describe a Skype module */ class modSkype extends DolibarrModules { @@ -59,31 +59,26 @@ class modSkype extends DolibarrModules $this->dirs = array(); // Config pages - //------------- $this->config_page_url = array(); - // Dependancies - //------------- - $this->hidden = ! empty($conf->global->MODULE_SKYPE_DISABLED); // A condition to disable module - $this->depends = array('modSociete'); // List of modules id that must be enabled if this module is enabled - $this->requiredby = array(); // List of modules id to disable if this one is disabled - $this->conflictwith = array(); // List of modules id this module is in conflict with + // Dependencies + $this->hidden = ! empty($conf->global->MODULE_SKYPE_DISABLED); // A condition to hide module + $this->depends = array('modSociete'); // List of module class names as string that must be enabled if this module is enabled + $this->requiredby = array(); // List of module ids to disable if this one is disabled + $this->conflictwith = array(); // List of module class names as string this module is in conflict with + $this->phpmin = array(5,4); // Minimum version of PHP required by module $this->langfiles = array(); // Constants - //----------- // New pages on tabs - // ----------------- $this->tabs = array(); // Boxes - //------ $this->boxes = array(); // Main menu entries - //------------------ $this->menu = array(); } } diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 09f38fdf452..a5913f9304f 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -40,7 +40,7 @@ $langs->setDefaultLang($setuplang); $langs->load("install"); -// Now we load forced value from install.forced.php file. +// Now we load forced/pre-set values from install.forced.php file. $useforcedwizard=false; $forcedfile="./install.forced.php"; if ($conffile == "/etc/dolibarr/conf.php") $forcedfile="/etc/dolibarr/install.forced.php"; @@ -49,14 +49,14 @@ if (@file_exists($forcedfile)) { include_once $forcedfile; } -dolibarr_install_syslog("--- check: Dolibarr install/upgrade process started"); +dolibarr_install_syslog("- check: Dolibarr install/upgrade process started"); /* * View */ -pHeader('',''); // No next step for navigation buttons. Next step is defined by clik on links. +pHeader('',''); // No next step for navigation buttons. Next step is defined by click on links. //print "
\n"; @@ -233,13 +233,13 @@ else else dolibarr_install_syslog("check: failed to create a new file " . $conffile . " into current dir " . getcwd() . ". Please check permissions.", LOG_ERR); } - // First install, we can't upgrade + // First install: no upgrade necessary/required $allowupgrade=false; } -// File is missng and can't be created +// File is missing and cannot be created if (! file_exists($conffile)) { print 'Error '.$langs->trans("ConfFileDoesNotExistsAndCouldNotBeCreated",$conffiletoshow); @@ -258,7 +258,7 @@ else $allowinstall=0; } - // File exists but can't be modified + // File exists but cannot be modified elseif (!is_writable($conffile)) { if ($confexists) @@ -294,7 +294,7 @@ else } print "
\n"; - // Requirements ok, we display the next step button + // Requirements met/all ok: display the next step button if ($checksok) { $ok=0; @@ -307,7 +307,7 @@ else { if (! file_exists($dolibarr_main_document_root."/core/lib/admin.lib.php")) { - print 'A '.$conffiletoshow.' file exists with a dolibarr_main_document_root to '.$dolibarr_main_document_root.' that seems wrong. Try to fix or remove the '.$conffiletoshow.' file.
'."\n"; + print 'A '.$conffiletoshow.' file exists with a dolibarr_main_document_root to '.$dolibarr_main_document_root.' that seems wrong. Try to fix or remove the '.$conffiletoshow.' file.
'."\n"; dol_syslog("A '" . $conffiletoshow . "' file exists with a dolibarr_main_document_root to " . $dolibarr_main_document_root . " that seems wrong. Try to fix or remove the '" . $conffiletoshow . "' file.", LOG_WARNING); } else @@ -326,7 +326,7 @@ else else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass); } - // $conf is already instancied inside inc.php + // $conf already created in inc.php $conf->db->type = $dolibarr_main_db_type; $conf->db->host = $dolibarr_main_db_host; $conf->db->port = $dolibarr_main_db_port; @@ -342,7 +342,7 @@ else } } - // If a database access is available, we set more variable + // If database access is available, we set more variables if ($ok) { if (empty($dolibarr_main_db_encryption)) $dolibarr_main_db_encryption=0; @@ -364,8 +364,8 @@ else // Show title if (! empty($conf->global->MAIN_VERSION_LAST_UPGRADE) || ! empty($conf->global->MAIN_VERSION_LAST_INSTALL)) { - print $langs->trans("VersionLastUpgrade").': '.(empty($conf->global->MAIN_VERSION_LAST_UPGRADE)?$conf->global->MAIN_VERSION_LAST_INSTALL:$conf->global->MAIN_VERSION_LAST_UPGRADE).'
'; - print $langs->trans("VersionProgram").': '.DOL_VERSION.''; + print $langs->trans("VersionLastUpgrade").': '.(empty($conf->global->MAIN_VERSION_LAST_UPGRADE)?$conf->global->MAIN_VERSION_LAST_INSTALL:$conf->global->MAIN_VERSION_LAST_UPGRADE).'
'; + print $langs->trans("VersionProgram").': '.DOL_VERSION.''; //print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired")); print '
'; print '
'; @@ -375,7 +375,7 @@ else print $langs->trans("InstallEasy")." "; print $langs->trans("ChooseYourSetupMode"); - print '

'; + print '
'; $foundrecommandedchoice=0; @@ -383,9 +383,9 @@ else $notavailable_choices = array(); // Show first install line - $choice = ''.$langs->trans("FreshInstall").''; + $choice = "\n".''.$langs->trans("FreshInstall").''; $choice .= ''; - $choice .= ''; + $choice .= ''; $choice .= $langs->trans("FreshInstallDesc"); if (empty($dolibarr_main_db_host)) // This means install process was not run { @@ -397,7 +397,7 @@ else } $choice .= ''; - $choice .= ''; + $choice .= ''; if ($allowinstall) { $choice .= ''.$langs->trans("Start").''; @@ -465,7 +465,7 @@ else if ($ok) { - if (count($dolibarrlastupgradeversionarray) >= 2) // If a database access is available and last upgrade version is known + if (count($dolibarrlastupgradeversionarray) >= 2) // If database access is available and last upgrade version is known { // Now we check if this is the first qualified choice if ($allowupgrade && empty($foundrecommandedchoice) && @@ -477,22 +477,23 @@ else } } else { - // We can not recommand a choice. + // We cannot recommend a choice. // A version of install may be known, but we need last upgrade. } } - $choice .= ''; - $choice .= ''.$langs->trans("Upgrade").'
'.$newversionfrom.$newversionfrombis.' -> '.$newversionto.''; - $choice .= ''; + $choice .= "\n".''; + $choice .= ''.$langs->trans("Upgrade").'
'.$newversionfrom.$newversionfrombis.' -> '.$newversionto.''; + $choice .= ''; $choice .= $langs->trans("UpgradeDesc"); if ($recommended_choice) { $choice .= '
'; //print $langs->trans("InstallChoiceRecommanded",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_UPGRADE); - $choice .= '
'.$langs->trans("InstallChoiceSuggested").'
'; - if ($count < count($migarray)) // There is other choices after + $choice .= '
'; + $choice .= '
'.$langs->trans("InstallChoiceSuggested").'
'; + if ($count < count($migarray)) // There are other choices after { print $langs->trans("MigrateIsDoneStepByStep",DOL_VERSION); } @@ -500,7 +501,7 @@ else } $choice .= ''; - $choice .= ''; + $choice .= ''; if ($allowupgrade) { $disabled=false; @@ -512,8 +513,14 @@ else { $foundrecommandedchoice = 2; } - if ($disabled) $choice .= ''.$langs->trans("NotAvailable").''; - else $choice .= ''.$langs->trans("Start").''; + if ($disabled) + { + $choice .= ''.$langs->trans("NotAvailable").''; + } + else + { + $choice .= ''.$langs->trans("Start").''; + } } else { @@ -537,28 +544,28 @@ else } // Array of install choices + print"\n"; print ''; foreach ($available_choices as $choice) { print $choice; } - print '
'; + print ''."\n"; if (count($notavailable_choices)) { - print '
'; print ''; print ''; } @@ -590,6 +597,5 @@ $(".runupgrade").click(function() { '; -dolibarr_install_syslog("--- check: end"); +dolibarr_install_syslog("- check: end"); pFooter(1); // Never display next button - diff --git a/htdocs/install/default.css b/htdocs/install/default.css index e23a36ddd21..6ea6d451e92 100644 --- a/htdocs/install/default.css +++ b/htdocs/install/default.css @@ -199,7 +199,7 @@ input:-webkit-autofill { -webkit-box-shadow: 0 0 0 50px #FBFFEA inset; } -table.listofchoices, tr.listofchoices, td.listofchoices { +table.listofchoices, table.listofchoices tr, table.listofchoices td { border-collapse: collapse; padding: 4px; color: #000000; @@ -207,9 +207,6 @@ table.listofchoices, tr.listofchoices, td.listofchoices { line-height: 18px; } -tr.listofchoices { - height: 42px; -} .listofchoicesdesc { color: #999 !important; } @@ -230,7 +227,7 @@ tr.listofchoices { div.ok { color: #114466; } -font.ok { +span.ok { color: #114466; } @@ -238,7 +235,7 @@ font.ok { div.warning { color: #777711; } -font.warning { +span.warning { color: #777711; } @@ -249,7 +246,7 @@ div.error { padding: 0.2em 0.2em 0.2em 0; margin: 0.5em 0 0.5em 0; } -font.error { +span.error { color: #550000; font-weight: bold; } diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index b0affb2218a..cee5d181d45 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -24,7 +24,7 @@ /** * \file htdocs/install/fileconf.php * \ingroup install - * \brief Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page step1) + * \brief Ask all information required to build Dolibarr htdocs/conf/conf.php file (will be written to disk on next page step1) */ include_once 'inc.php'; @@ -39,7 +39,7 @@ $langs->setDefaultLang($setuplang); $langs->load("install"); $langs->load("errors"); -dolibarr_install_syslog("--- fileconf: entering fileconf.php page"); +dolibarr_install_syslog("- fileconf: entering fileconf.php page"); // You can force preselected values of the config step of Dolibarr by adding a file // install.forced.php into directory htdocs/install (This is the case with some wizard @@ -56,7 +56,7 @@ if (! isset($force_install_databaselogin)) $force_install_databaselogin=''; if (! isset($force_install_databasepass)) $force_install_databasepass=''; if (! isset($force_install_databaserootlogin)) $force_install_databaserootlogin=''; if (! isset($force_install_databaserootpass)) $force_install_databaserootpass=''; -// Now we load forced value from install.forced.php file. +// Now we load forced values from install.forced.php file. $useforcedwizard=false; $forcedfile="./install.forced.php"; if ($conffile == "/etc/dolibarr/conf.php") $forcedfile="/etc/dolibarr/install.forced.php"; // Must be after inc.php @@ -71,7 +71,7 @@ if (@file_exists($forcedfile)) { * View */ -session_start(); // To be able to keep info into session (used for not loosing pass during navigation. pass must not transit throug parmaeters) +session_start(); // To be able to keep info into session (used for not losing pass during navigation. pass must not transit through parmaeters) pHeader($langs->trans("ConfigurationFile"), "step1", "set", "", (empty($force_dolibarr_js_JQUERY)?'':$force_dolibarr_js_JQUERY.'/'), 'main-inside-bis'); @@ -80,7 +80,7 @@ if (! is_writable($conffile)) { print $langs->trans("ConfFileIsNotWritable", $conffiletoshow); dolibarr_install_syslog("fileconf: config file is not writable", LOG_WARNING); - dolibarr_install_syslog("--- fileconf: end"); + dolibarr_install_syslog("- fileconf: end"); pFooter(1,$setuplang,'jscheckparam'); exit; } @@ -117,20 +117,18 @@ if (! empty($force_install_message)) - '; - print $langs->trans("WebPagesDirectory"); - print ""; - + + - + @@ -149,19 +147,19 @@ if (! empty($force_install_message)) - trans("DocumentsDirectory"); ?> - + - + @@ -186,12 +184,13 @@ if (! empty($force_install_message)) } ?> - trans("URLRoot"); ?> + - + - trans("ForceHttps"); ?> - - + + @@ -239,11 +239,11 @@ if (! empty($force_install_message)) - trans("DatabaseName"); ?> - - - + + - trans("DriverType"); ?> - + - trans("DatabaseServer"); ?> - - + + - trans("Port"); ?> - + + - trans("DatabasePrefix"); ?> - - - + + - trans("CreateDatabase"); ?> - - + + - trans("Login"); ?> - - - + + - trans("Password"); ?> - - - + + - trans("CreateUser"); ?> - - + + @@ -473,8 +471,8 @@ if (! empty($force_install_message)) - trans("Login"); ?> - + + - trans("Password"); ?> - - + + close(); Not database connexion yet -dolibarr_install_syslog("--- fileconf: end"); +dolibarr_install_syslog("- fileconf: end"); pFooter($err,$setuplang,'jscheckparam'); diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 0a2a6866f26..88dbc76f9a6 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -149,7 +149,7 @@ if ($suburi == '/') $suburi = ''; // If $suburi is /, it is now '' define('DOL_URL_ROOT', $suburi); // URL relative root ('', '/dolibarr', ...) -if (empty($conf->file->character_set_client)) $conf->file->character_set_client="UTF-8"; +if (empty($conf->file->character_set_client)) $conf->file->character_set_client="utf-8"; if (empty($conf->db->character_set)) $conf->db->character_set='utf8'; if (empty($conf->db->dolibarr_main_db_collation)) $conf->db->dolibarr_main_db_collation='utf8_unicode_ci'; if (empty($conf->db->dolibarr_main_db_encryption)) $conf->db->dolibarr_main_db_encryption=0; diff --git a/htdocs/install/index.php b/htdocs/install/index.php index 82dcd87b030..46e60be52ec 100644 --- a/htdocs/install/index.php +++ b/htdocs/install/index.php @@ -55,7 +55,7 @@ print '

'; print ''; print ''; -print ''; print ''; diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php index 97f9a71bb87..0c3edfaebd3 100644 --- a/htdocs/install/repair.php +++ b/htdocs/install/repair.php @@ -549,11 +549,11 @@ if ($ok && GETPOST('clean_menus','alpha')) dol_print_error($db); } else - print ' - Cleaned'; + print ' - Cleaned'; } else { - print ' - Canceled (test mode)'; + print ' - Canceled (test mode)'; } } else @@ -982,11 +982,11 @@ if ($ok && GETPOST('force_disable_of_modules_not_found','alpha')) dol_print_error($db); } else - print ' - Cleaned'; + print ' - Cleaned'; } else { - print ' - Canceled (test mode)'; + print ' - Canceled (test mode)'; } } else diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php index 6f1143d6f10..f6f1571b4ec 100644 --- a/htdocs/install/step1.php +++ b/htdocs/install/step1.php @@ -46,7 +46,7 @@ $main_dir = GETPOST('main_dir')?GETPOST('main_dir'):(empty($argv[3])?'':$argv[3] $main_data_dir = GETPOST('main_data_dir') ? GETPOST('main_data_dir') : (empty($argv[4])? ($main_dir . '/documents') :$argv[4]); // Dolibarr root URL $main_url = GETPOST('main_url')?GETPOST('main_url'):(empty($argv[5])?'':$argv[5]); -// Database login informations +// Database login information $userroot=GETPOST('db_user_root','alpha')?GETPOST('db_user_root','alpha'):(empty($argv[6])?'':$argv[6]); $passroot=GETPOST('db_pass_root','none')?GETPOST('db_pass_root','none'):(empty($argv[7])?'':$argv[7]); // Database server @@ -68,18 +68,18 @@ $main_alt_dir_name = ((GETPOST("main_alt_dir_name",'alpha') && GETPOST("main_alt session_start(); // To be able to keep info into session (used for not losing password during navigation. The password must not transit through parameters) -// Save a flag to tell to restore input value if we do back +// Save a flag to tell to restore input value if we go back $_SESSION['dol_save_pass']=$db_pass; //$_SESSION['dol_save_passroot']=$passroot; -// Now we load forced value from install.forced.php file. +// Now we load forced values from install.forced.php file. $useforcedwizard=false; $forcedfile="./install.forced.php"; if ($conffile == "/etc/dolibarr/conf.php") $forcedfile="/etc/dolibarr/install.forced.php"; if (@file_exists($forcedfile)) { $useforcedwizard = true; include_once $forcedfile; - // If forced install is enabled, let's replace post values. These are empty because form fields are disabled. + // If forced install is enabled, replace the post values. These are empty because form fields are disabled. if ($force_install_noedit) { $main_dir = detect_dolibarr_main_document_root(); if (!empty($force_install_main_data_root)) { @@ -204,7 +204,7 @@ if (! $error) { $result=@include_once $main_dir."/core/db/".$db_type.'.class.php'; if ($result) { - // If we ask database or user creation we need to connect as root, so we need root login + // If we require database or user creation we need to connect as root, so we need root login credentials if (!empty($db_create_database) && !$userroot) { print '
'.$langs->trans("YouAskDatabaseCreationSoDolibarrNeedToConnect",$db_name).'
'; print '
'; @@ -397,7 +397,7 @@ if (! $error && $db->connected && $action == "set") print ""; print ''; $error++; @@ -420,7 +420,7 @@ if (! $error && $db->connected && $action == "set") } } - // Les documents sont en dehors de htdocs car ne doivent pas pouvoir etre telecharges en passant outre l'authentification + // Documents are stored above the web pages root to prevent being downloaded without authentification $dir=array(); $dir[] = $main_data_dir."/mycompany"; $dir[] = $main_data_dir."/medias"; @@ -431,7 +431,7 @@ if (! $error && $db->connected && $action == "set") $dir[] = $main_data_dir."/produit"; $dir[] = $main_data_dir."/doctemplates"; - // Boucle sur chaque repertoire de dir[] pour les creer s'ils nexistent pas + // Loop on each directory of dir [] to create them if they do not exist $num=count($dir); for ($i = 0; $i < $num; $i++) { @@ -469,7 +469,7 @@ if (! $error && $db->connected && $action == "set") print ""; print ''; } @@ -519,7 +519,7 @@ if (! $error && $db->connected && $action == "set") // Save old conf file on disk if (file_exists("$conffile")) { - // We must ignore errors as an existing old file may already exists and not be replacable or + // We must ignore errors as an existing old file may already exist and not be replaceable or // the installer (like for ubuntu) may not have permission to create another file than conf.php. // Also no other process must be able to read file or we expose the new file, so content with password. @dol_copy($conffile, $conffile.'.old', '0400'); @@ -539,7 +539,7 @@ if (! $error && $db->connected && $action == "set") print ''; print ''; - // Si creation utilisateur admin demandee, on le cree + // Create database user if requested if (isset($db_create_user) && ($db_create_user == "1" || $db_create_user == "on")) { dolibarr_install_syslog("step1: create database user: " . $dolibarr_main_db_user); @@ -558,7 +558,7 @@ if (! $error && $db->connected && $action == "set") $databasefortest='master'; } - // Creation handler de base, verification du support et connexion + // Check database connection $db=getDoliDBInstance($conf->db->type,$conf->db->host,$userroot,$passroot,$databasefortest,$conf->db->port); @@ -629,7 +629,7 @@ if (! $error && $db->connected && $action == "set") print ''; print ''; - // Affiche aide diagnostique + // warning message due to connection failure print ''; print ''; - // Affiche aide diagnostique + // warning message print '"; - // si acces serveur ok et acces base ok, tout est ok, on ne va pas plus loin, on a meme pas utilise le compte root. + // server access ok, basic access ok if ($db->database_selected) { dolibarr_install_syslog("step1: connection to database " . $conf->db->name . " by user " . $conf->db->user . " ok"); @@ -747,7 +747,7 @@ if (! $error && $db->connected && $action == "set") print 'Error'; print ""; - // Affiche aide diagnostique + // warning message print '"; - // Affiche aide diagnostique + // warning message print '\n"; + print '\n"; } } } diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang index 266b2fae483..bd2afe049e5 100644 --- a/htdocs/langs/en_US/accountancy.lang +++ b/htdocs/langs/en_US/accountancy.lang @@ -36,7 +36,7 @@ AlreadyInGeneralLedger=Already journalized in ledgers NotYetInGeneralLedger=Not yet journalized in ledgers GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group DetailByAccount=Show detail by account -AccountWithNonZeroValues=Accounts with non zero values +AccountWithNonZeroValues=Accounts with non-zero values ListOfAccounts=List of accounts MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup @@ -58,7 +58,7 @@ AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. F AccountancyAreaDescDefault=STEP %s: Define default accounting accounts. For this, use the menu entry %s. AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s. AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s. -AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expences (miscellaneous taxes). For this, use the menu entry %s. +AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expenses (miscellaneous taxes). For this, use the menu entry %s. AccountancyAreaDescDonation=STEP %s: Define default accounting accounts for donation. For this, use the menu entry %s. AccountancyAreaDescMisc=STEP %s: Define mandatory default account and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s. AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s. @@ -198,13 +198,13 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service Pcgtype=Group of account Pcgsubtype=Subgroup of account -PcgtypeDesc=Group and subgroup of account are used as predefined 'filter' and 'grouping' criterias for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report. +PcgtypeDesc=Group and subgroup of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report. TotalVente=Total turnover before tax TotalMarge=Total sales margin DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account -DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button "%s". If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "%s". +DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button "%s". If account was not set on product/service cards or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "%s". DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account: @@ -213,7 +213,7 @@ DescVentilSupplier=Consult here the list of vendor invoice lines bound or not ye DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account -DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button "%s". If account was not set on fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "%s". +DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button "%s". If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "%s". DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account ValidateHistory=Bind Automatically @@ -232,7 +232,7 @@ NotYetAccounted=Not yet accounted in ledger ## Admin ApplyMassCategories=Apply mass categories -AddAccountFromBookKeepingWithNoCategories=Available acccount not yet in a personalized group +AddAccountFromBookKeepingWithNoCategories=Available account not yet in a personalized group CategoryDeleted=Category for the accounting account has been removed AccountingJournals=Accounting journals AccountingJournal=Accounting journal @@ -292,15 +292,15 @@ ErrorNoAccountingCategoryForThisCountry=No accounting account group available fo ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice %s, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused. ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account. ExportNotSupported=The export format setuped is not supported into this page -BookeppingLineAlreayExists=Lines already existing into bookeeping +BookeppingLineAlreayExists=Lines already existing into bookkeeping NoJournalDefined=No journal defined Binded=Lines bound ToBind=Lines to bind -UseMenuToSetBindindManualy=Autodection not possible, use menu %s to make the binding manually +UseMenuToSetBindindManualy=Autodetection not possible, use menu %s to make the binding manually ## Import ImportAccountingEntries=Accounting entries -WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate. +WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate. ExpenseReportJournal=Expense Report Journal InventoryJournal=Inventory Journal diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 8907f746583..8bff31cc283 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -10,9 +10,9 @@ VersionDevelopment=Development VersionUnknown=Unknown VersionRecommanded=Recommended FileCheck=Files integrity checker -FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example. +FileCheckDesc=This tool allows you to check the integrity of files and the setup of your application, comparing each file with the official one. The value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker, for example. FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference. -FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added. +FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files have been added. FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added. GlobalChecksum=Global checksum MakeIntegrityAnalysisFrom=Make integrity analysis of application files from @@ -30,14 +30,14 @@ SessionSaveHandler=Handler to save sessions SessionSavePath=Storage session localization PurgeSessions=Purge of sessions ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself). -NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow to list all running sessions. +NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow listing all running sessions. LockNewSessions=Lock new connections -ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself. Only user %s will be able to connect after that. +ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself? Only user %s will be able to connect after that. UnlockNewSessions=Remove connection lock YourSession=Your session -Sessions=Users session +Sessions=Users sessions WebUserGroup=Web server user/group -NoSessionFound=Your PHP seems to not allow to list active sessions. Directory used to save sessions (%s) might be protected (For example, by OS permissions or by PHP directive open_basedir). +NoSessionFound=Your PHP seems to not allow listing of active sessions. The directory used to save sessions (%s) might be protected (For example, by OS permissions or by PHP directive open_basedir). DBStoringCharset=Database charset to store data DBSortingCharset=Database charset to sort data ClientCharset=Client charset @@ -50,7 +50,7 @@ ExternalUser=External user InternalUsers=Internal users ExternalUsers=External users GUISetup=Display -SetupArea=Setup area +SetupArea=Setup UploadNewTemplate=Upload new template(s) FormToTestFileUploadForm=Form to test file upload (according to setup) IfModuleEnabled=Note: yes is effective only if module %s is enabled @@ -68,8 +68,8 @@ ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. -DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties, but it is less convenient) -DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact, but it is less convenient) +DelaiedFullListToSelectCompany=Wait until you press a key before loading content of third-parties combo list (This may increase performance if you have a large number of third-parties, but it is less convenient) +DelaiedFullListToSelectContact=Wait until you press a key before loading content of contact combo list (This may increase performance if you have a large number of contacts, but it is less convenient) NumberOfKeyToSearch=Nbr of characters to trigger search: %s NotAvailableWhenAjaxDisabled=Not available when Ajax disabled AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party @@ -80,7 +80,7 @@ PreviewNotAvailable=Preview not available ThemeCurrentlyActive=Theme currently active CurrentTimeZone=TimeZone PHP (server) MySQLTimeZone=TimeZone MySql (database) -TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered). +TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered). Space=Space Table=Table Fields=Fields @@ -111,14 +111,14 @@ NotConfigured=Module/Application not configured Active=Active SetupShort=Setup OtherOptions=Other options -OtherSetup=Other setup +OtherSetup=Other Setup CurrentValueSeparatorDecimal=Decimal separator CurrentValueSeparatorThousand=Thousand separator Destination=Destination IdModule=Module ID IdPermissions=Permissions ID LanguageBrowserParameter=Parameter %s -LocalisationDolibarrParameters=Localisation parameters +LocalisationDolibarrParameters=Localization parameters ClientTZ=Client Time Zone (user) ClientHour=Client time (user) OSTZ=Server OS Time Zone @@ -126,8 +126,8 @@ PHPTZ=PHP server Time Zone DaylingSavingTime=Daylight saving time CurrentHour=PHP Time (server) CurrentSessionTimeOut=Current session timeout -YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris" -HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server. +YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a .htaccess file with a line like this "SetEnv TZ Europe/Paris" +HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but of the timezone of the server. Box=Widget Boxes=Widgets MaxNbOfLinesForBoxes=Max number of lines for widgets @@ -191,14 +191,14 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE) AutoDetectLang=Autodetect (browser language) FeatureDisabledInDemo=Feature disabled in demo FeatureAvailableOnlyOnStable=Feature only available on official stable versions -BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it. +BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it. OnlyActiveElementsAreShown=Only elements from enabled modules are shown. -ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application. +ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button to enable/disable a module/application. ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet... -ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab %s. +ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab %s. ModulesMarketPlaces=Find external app/modules ModulesDevelopYourModule=Develop your own app/modules -ModulesDevelopDesc=You can develop or find a partner to develop for you, your personalised module +ModulesDevelopDesc=You may also develop your own module or find a partner to develop one for you. DOLISTOREdescriptionLong=Instead of switching on www.dolistore.com web site to find an external module, you can use this embedded tool that will make the seach on the external market place for you (may be slow, need an internet access)... NewModule=New FreeModule=Free @@ -211,8 +211,8 @@ Nouveauté=Novelty AchatTelechargement=Buy / Download GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at %s. DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules -DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project) -WebSiteDesc=Reference websites to find more modules... +DoliPartnersDesc=List of companies providing custom-developed modules or features.
Note: since Dolibarr is an open source application, anyone experienced in PHP programming may develop a module. +WebSiteDesc=External websites for more add-on (non-core) modules... DevelopYourModuleDesc=Some solutions to develop your own module... URL=Link BoxesAvailable=Widgets available @@ -229,7 +229,7 @@ DoNotStoreClearPassword=Do no store clear passwords in database but store only e MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activated recommended) InstrucToEncodePass=To have password encoded into the conf.php file, replace the line
$dolibarr_main_db_pass="...";
by
$dolibarr_main_db_pass="crypted:%s"; InstrucToClearPass=To have password decoded (clear) into the conf.php file, replace the line
$dolibarr_main_db_pass="crypted:...";
by
$dolibarr_main_db_pass="%s"; -ProtectAndEncryptPdfFiles=Protection of generated pdf files (Activated NOT recommended, breaks mass pdf generation) +ProtectAndEncryptPdfFiles=Protection of generated PDF files NOT recommended, breaks mass PDF generation) ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working. Feature=Feature DolibarrLicense=License @@ -246,8 +246,8 @@ ExternalResources=External resources SocialNetworks=Social Networks ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),
take a look at the Dolibarr Wiki:
%s ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:
%s -HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr. -HelpCenterDesc2=Some part of this service are available in english only. +HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr. +HelpCenterDesc2=Some of these resources are only available in english. CurrentMenuHandler=Current menu handler MeasuringUnit=Measuring unit LeftMargin=Left margin @@ -262,27 +262,27 @@ NoticePeriod=Notice period NewByMonth=New by month Emails=Emails EMailsSetup=Emails setup -EMailsDesc=This page allows you to overwrite your PHP parameters for emails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless. +EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary. EmailSenderProfiles=Emails sender profiles -MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: %s) -MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: %s) -MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems) -MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems) -MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: %s) -MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent) -MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to -MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos) +MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: %s) +MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (default value in php.ini: %s) +MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix-like systems) +MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix-like systems) +MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (default value in php.ini: %s) +MAIN_MAIL_ERRORS_TO=Email used for error returns emails (fields 'Errors-To' in emails sent) +MAIN_MAIL_AUTOCOPY_TO= Copy (Bcc) all sent emails to +MAIN_DISABLE_ALL_MAILS=Disable all email sending (for test purposes or demos) MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes) -MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list -MAIN_MAIL_SENDMODE=Method to use to send EMails -MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required -MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required -MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt -MAIN_MAIL_EMAIL_STARTTLS= Use TLS (STARTTLS) encrypt -MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos) +MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employee users with email into allowed recipient list +MAIN_MAIL_SENDMODE=Email sending method +MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication) +MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication) +MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encryption +MAIN_MAIL_EMAIL_STARTTLS= Use TLS (STARTTLS) encryption +MAIN_DISABLE_ALL_SMS=Disable all SMS sending (for test purposes or demos) MAIN_SMS_SENDMODE=Method to use to send SMS -MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending -MAIN_MAIL_DEFAULT_FROMTYPE=Sender email by default for manual sendings (User email or Company email) +MAIN_MAIL_SMS_FROM=Default sender phone number for SMS sending +MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email or Company email) UserEmail=User email CompanyEmail=Company email FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally. @@ -311,13 +311,13 @@ ThisIsAlternativeProcessToFollow=This is an alternative setup to process manuall StepNb=Step %s FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s). DownloadPackageFromWebSite=Download package (for example from official web site %s). -UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: %s -UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: %s +UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into the server directory dedicated to Dolibarr: %s +UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:
%s SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: %s. NotExistsDirect=The alternative root directory is not defined to an existing directory.
InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.
Just create a directory at the root of Dolibarr (eg: custom).
InfDirExample=
Then declare it in the file conf.php
$dolibarr_main_url_root_alt='/custom'
$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'
If these lines are commented with "#", to enable them, just uncomment by removing the "#" character. -YouCanSubmitFile=For this step, you can submit the .zip file of module package here : +YouCanSubmitFile=Alternatively, you may upload the module .zip file package: CurrentVersion=Dolibarr current version CallUpdatePage=Go to the page that updates the database structure and data: %s. LastStableVersion=Latest stable version @@ -352,7 +352,7 @@ ConfirmPurge=Are you sure you want to execute this purge?
This will delete de MinLength=Minimum length LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory LanguageFile=Language file -ExamplesWithCurrentSetup=Examples with current running setup +ExamplesWithCurrentSetup=Examples with current configuration ListOfDirectories=List of OpenDocument templates directories ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.

Put here full path of directories.
Add a carriage return between eah directory.
To add a directory of the GED module, add here DOL_DATA_ROOT/ecm/yourdirectoryname.

Files in those directories must end with .odt or .ods. NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories @@ -370,9 +370,9 @@ ResponseTimeout=Response timeout SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__ ModuleMustBeEnabledFirst=Module %s must be enabled first if you need this feature. SecurityToken=Key to secure URLs -NoSmsEngine=No SMS sender manager available. SMS sender manager are not installed with default distribution (because they depends on an external supplier) but you can find some on %s +NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external supplier, but you can find some on %s PDF=PDF -PDFDesc=You can set each global options related to the PDF generation +PDFDesc=You can set each global option related to the PDF generation PDFAddressForging=Rules to forge address boxes HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF PDFRulesForSalesTax=Rules for Sales Tax / VAT @@ -387,7 +387,7 @@ UrlGenerationParameters=Parameters to secure URLs SecurityTokenIsUnique=Use a unique securekey parameter for each URL EnterRefToBuildUrl=Enter reference for object %s GetSecuredUrl=Get calculated URL -ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons +ButtonHideUnauthorized=Hide buttons to non-admin users for unauthorized actions instead of showing greyed disabled buttons OldVATRates=Old VAT rate NewVATRates=New VAT rate PriceBaseTypeToChange=Modify on prices with base reference value defined on @@ -432,7 +432,7 @@ DefaultLink=Default link SetAsDefault=Set as default ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url) ExternalModule=External module - Installed into directory %s -BarcodeInitForThirdparties=Mass barcode init for thirdparties +BarcodeInitForthird-parties=Mass barcode init for third-parties BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services CurrentlyNWithoutBarCode=Currently, you have %s record on %s %s without barcode defined. InitEmptyBarCode=Init value for next %s empty records @@ -446,14 +446,14 @@ NoDetails=No more details in footer DisplayCompanyInfo=Display company address DisplayCompanyManagers=Display manager names DisplayCompanyInfoAndManagers=Display company address and manager names -EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible. +EnableAndSetupModuleCron=If you want to have this recurring invoice generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template using the *Create* button. Note that even if you enabled automatic generation, you can still safely launch manual generation. Generation of duplicates for the same period is not possible. ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code ModuleCompanyCodePanicum=Return an empty accounting code. ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code. Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).
Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required. UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than... -WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).
If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account). +WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be careful also to your email provider sending quota).
If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account). WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: %s. ClickToShowDescription=Click to show description DependsOn=This module need the module(s) @@ -461,10 +461,10 @@ RequiredBy=This module is required by module(s) TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. This need to have technical knowledges to read the content of the HTML page to get the key name of a field. PageUrlForDefaultValues=You must enter here the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples: PageUrlForDefaultValuesCreate=
For form to create a new thirdparty, it is %s,
If you want default value only if url has some parameter, you can use %s -PageUrlForDefaultValuesList=
For page that list thirdparties, it is %s,
If you want default value only if url has some parameter, you can use %s +PageUrlForDefaultValuesList=
For page that list third-parties, it is %s,
If you want default value only if url has some parameter, you can use %s EnableDefaultValues=Enable usage of personalized default values EnableOverwriteTranslation=Enable usage of overwrote translation -GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation. +GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation. WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior. Field=Field ProductDocumentTemplates=Document templates to generate product document @@ -480,7 +480,7 @@ DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory ev # Modules Module0Name=Users & groups Module0Desc=Users / Employees and Groups management -Module1Name=Third parties +Module1Name=Third Parties Module1Desc=Companies and contact management (customers, prospects...) Module2Name=Commercial Module2Desc=Commercial management @@ -511,13 +511,13 @@ Module52Desc=Stock management (products) Module53Name=Services Module53Desc=Service management Module54Name=Contracts/Subscriptions -Module54Desc=Management of contracts (services or reccuring subscriptions) +Module54Desc=Management of contracts (services or recurring subscriptions) Module55Name=Barcodes Module55Desc=Barcode management Module56Name=Telephony Module56Desc=Telephony integration Module57Name=Direct bank payment orders -Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries. +Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries. Module58Name=ClickToDial Module58Desc=Integration of a ClickToDial system (Asterisk, ...) Module59Name=Bookmark4u @@ -530,18 +530,18 @@ Module80Name=Shipments Module80Desc=Shipments and delivery order management Module85Name=Banks and cash Module85Desc=Management of bank or cash accounts -Module100Name=External site -Module100Desc=This module include an external web site or page into Dolibarr menus and view it into a Dolibarr frame +Module100Name=External Site +Module100Desc=Add external website link into Dolibarr menus to view it in a Dolibarr frame Module105Name=Mailman and SPIP Module105Desc=Mailman or SPIP interface for member module Module200Name=LDAP -Module200Desc=LDAP directory synchronisation +Module200Desc=LDAP directory synchronization Module210Name=PostNuke Module210Desc=PostNuke integration Module240Name=Data exports Module240Desc=Tool to export Dolibarr data (with assistants) Module250Name=Data imports -Module250Desc=Tool to import data in Dolibarr (with assistants) +Module250Desc=Tool to import data into Dolibarr (with assistants) Module310Name=Members Module310Desc=Foundation members management Module320Name=RSS Feed @@ -555,18 +555,18 @@ Module410Desc=Webcalendar integration Module500Name=Taxes and Special expenses Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...) Module510Name=Payment of employee wages -Module510Desc=Record and follow payment of your employee wages +Module510Desc=Record and track employee payments Module520Name=Loan Module520Desc=Management of loans Module600Name=Notifications on business events -Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), to third-party contacts (setup defined on each third party) or to fixed emails -Module600Long=Note that this module is dedicated to send real time emails when a dedicated business event occurs. If you are looking for a feature to send reminders by email of your agenda events, go into setup of module Agenda. +Module600Desc=Send email notifications triggered by a business event, for users (setup defined on each user), third-party contacts (setup defined on each third party) or to defined emails +Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders of agenda events, go into the setup of module Agenda. Module610Name=Product Variants -Module610Desc=Allows creation of products variant based on attributes (color, size, ...) +Module610Desc=Creation of product variants (color, size etc.) Module700Name=Donations Module700Desc=Donation management Module770Name=Expense reports -Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module770Desc=Manage and claim expense reports (transportation, meal, ...) Module1120Name=Vendor commercial proposal Module1120Desc=Request vendor commercial proposal and prices Module1200Name=Mantis @@ -576,13 +576,13 @@ Module1520Desc=Mass mail document generation Module1780Name=Tags/Categories Module1780Desc=Create tags/category (products, customers, vendors, contacts or members) Module2000Name=WYSIWYG editor -Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor) +Module2000Desc=Allow text fields to be edited using CKEditor Module2200Name=Dynamic Prices Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Scheduled jobs Module2300Desc=Scheduled jobs management (alias cron or chrono table) Module2400Name=Events/Agenda -Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management. +Module2400Desc=Track events. Let Dolibarr log automatic events for tracking purposes or record manual events or meetings. This is the main important module for a good Customer or Supplier Relationship Management. Module2500Name=DMS / ECM Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need. Module2600Name=API/Web services (SOAP server) @@ -590,7 +590,7 @@ Module2600Desc=Enable the Dolibarr SOAP server providing API services Module2610Name=API/Web services (REST server) Module2610Desc=Enable the Dolibarr REST server providing API services Module2660Name=Call WebServices (SOAP client) -Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) +Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access Module2800Desc=FTP Client @@ -599,7 +599,7 @@ Module2900Desc=GeoIP Maxmind conversions capabilities Module3100Name=Skype Module3100Desc=Add a Skype button into users / third parties / contacts / members cards Module3200Name=Unalterable Archives -Module3200Desc=Activate log of some business events into an unalterable log. Events are archived in real-time. The log is a table of chained events that can be read only and exported. This module may be mandatory for some countries. +Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries. Module4000Name=HRM Module4000Desc=Human resources management (management of department, employee contracts and feelings) Module5000Name=Multi-company @@ -609,27 +609,29 @@ Module6000Desc=Workflow management (automatic creation of object and/or automati Module10000Name=Websites Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name. Module20000Name=Leave Requests management -Module20000Desc=Declare and follow employees leaves requests +Module20000Desc=Declare and track employees leave requests Module39000Name=Products lots Module39000Desc=Lot or serial number, eat-by and sell-by date management on products +Module40000Name=Multicurrency +Module40000Desc=Use alternative currencies in prices and documents Module50000Name=PayBox -Module50000Desc=Module to offer an online payment page accepting payments with Credit/Debit card via PayBox. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...) +Module50000Desc=Offer customers a PayBox online payment page (credit/debit cards). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...) Module50100Name=Point of sales Module50100Desc=Point of sales module (POS). Module50200Name=Paypal -Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...) +Module50200Desc=Offer customers a PayPal online payment page (PayPal account or credit/debit cards). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...) Module50400Name=Accounting (advanced) Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format. Module54000Name=PrintIPP -Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server). Module55000Name=Poll, Survey or Vote -Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...) +Module55000Desc=Module to create online polls, surveys or votes (like Doodle, Studs, Rdvz, ...) Module59000Name=Margins Module59000Desc=Module to manage margins Module60000Name=Commissions Module60000Desc=Module to manage commissions -Module62000Name=Incoterm -Module62000Desc=Add features to manage Incoterm +Module62000Name=Incoterms +Module62000Desc=Add features to manage Incoterms Module63000Name=Resources Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events Permission11=Read customer invoices @@ -651,9 +653,9 @@ Permission32=Create/modify products Permission34=Delete products Permission36=See/manage hidden products Permission38=Export products -Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet) -Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks -Permission44=Delete projects (shared project and projects i'm contact for) +Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet) +Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks +Permission44=Delete projects (shared project and projects I'm contact for) Permission45=Export projects Permission61=Read interventions Permission62=Create/modify interventions @@ -725,7 +727,7 @@ Permission187=Close supplier orders Permission188=Cancel supplier orders Permission192=Create lines Permission193=Cancel lines -Permission194=Read the bandwith lines +Permission194=Read the bandwidth lines Permission202=Create ADSL connections Permission203=Order connections orders Permission204=Order connections @@ -750,12 +752,12 @@ Permission244=See the contents of the hidden categories Permission251=Read other users and groups PermissionAdvanced251=Read other users Permission252=Read permissions of other users -Permission253=Create/modify other users, groups and permisssions +Permission253=Create/modify other users, groups and permissions PermissionAdvanced253=Create/modify internal/external users and permissions Permission254=Create/modify external users only Permission255=Modify other users password Permission256=Delete or disable other users -Permission262=Extend access to all third parties (not only third parties that user is a sale representative).
Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc).
Not effective for projects (only rules on project permissions, visibility and assignement matters). +Permission262=Extend access to all third parties (not only third parties that user is a sale representative).
Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).
Not effective for projects (only rules on project permissions, visibility and assignment matters). Permission271=Read CA Permission272=Read invoices Permission273=Issue invoices @@ -880,8 +882,8 @@ Permission63001=Read resources Permission63002=Create/modify resources Permission63003=Delete resources Permission63004=Link resources to agenda events -DictionaryCompanyType=Types of thirdparties -DictionaryCompanyJuridicalType=Legal forms of thirdparties +DictionaryCompanyType=Types of third-parties +DictionaryCompanyJuridicalType=Legal forms of third-parties DictionaryProspectLevel=Prospect potential level DictionaryCanton=State/Province DictionaryRegion=Regions @@ -908,7 +910,7 @@ DictionarySource=Origin of proposals/orders DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Models for chart of accounts DictionaryAccountancyJournal=Accounting journals -DictionaryEMailTemplates=Emails templates +DictionaryEMailTemplates=Email Templates DictionaryUnits=Units DictionaryProspectStatus=Prospection status DictionaryHolidayTypes=Types of leaves @@ -921,8 +923,8 @@ BackToModuleList=Back to modules list BackToDictionaryList=Back to dictionaries list TypeOfRevenueStamp=Type of tax stamp VATManagement=VAT Management -VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
In any othe case the proposed default is VAT=0. End of rule. -VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies. +VATIsUsedDesc=By default when creating prospects, invoices, orders etc. the VAT rate follows the active standard rule:
If the seller is not subject to VAT, then VAT defaults to 0. End of rule.

If the (seller's country = buyer's country), then the VAT by default equals the VAT of the product in the seller's country. End of rule.

If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependant on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to their customs office in their country and not to the seller. End of rule.

If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT by defaults to the VAT of the seller's country. End of rule.

If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.

In any other case the proposed default is VAT=0. End of rule.

+VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals or small companies. VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared. VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration. This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices. ##### Local Taxes ##### @@ -940,15 +942,15 @@ LocalTax2Management=Third type of tax LocalTax2IsUsedExample= LocalTax2IsNotUsedExample= LocalTax1ManagementES= RE Management -LocalTax1IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:
If te buyer is not subjected to RE, RE by default=0. End of rule.
If the buyer is subjected to RE then the RE by default. End of rule.
+LocalTax1IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc. follow the active standard rule:
If the buyer is not subjected to RE, RE by default=0. End of rule.
If the buyer is subjected to RE then the RE by default. End of rule.
LocalTax1IsNotUsedDescES= By default the proposed RE is 0. End of rule. LocalTax1IsUsedExampleES= In Spain they are professionals subject to some specific sections of the Spanish IAE. LocalTax1IsNotUsedExampleES= In Spain they are professional and societies and subject to certain sections of the Spanish IAE. LocalTax2ManagementES= IRPF Management -LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:
If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.
If the seller is subjected to IRPF then the IRPF by default. End of rule.
+LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc. follow the active standard rule:
If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.
If the seller is subjected to IRPF then the IRPF by default. End of rule.
LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. End of rule. LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules. -LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules. +LocalTax2IsNotUsedExampleES= In Spain they are businesses not subject to tax system of modules. CalcLocaltax=Reports on local taxes CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases @@ -997,17 +999,17 @@ Skin=Skin theme DefaultSkin=Default skin theme MaxSizeList=Max length for list DefaultMaxSizeList=Default max length for lists -DefaultMaxSizeShortList=Default max length for short lists (ie in customer card) +DefaultMaxSizeShortList=Default max length for short lists (i.e. in customer card) MessageOfDay=Message of the day MessageLogin=Login page message LoginPage=Login page BackgroundImageLogin=Background image PermanentLeftSearchForm=Permanent search form on left menu -DefaultLanguage=Default language to use (language code) +DefaultLanguage=Default language to use (variant) EnableMultilangInterface=Enable multilingual interface EnableShowLogo=Show logo on left menu -CompanyInfo=Company/organization information -CompanyIds=Company/organization identities +CompanyInfo=Company/Organization +CompanyIds=Company/Organization identities CompanyName=Name CompanyAddress=Address CompanyZip=Zip @@ -1022,28 +1024,28 @@ OwnerOfBankAccount=Owner of bank account %s BankModuleNotActive=Bank accounts module not enabled ShowBugTrackLink=Show link "%s" Alerts=Alerts -DelaysOfToleranceBeforeWarning=Tolerance delays before warning -DelaysOfToleranceDesc=This screen allows you to define the tolerated delays before an alert is reported on screen with picto %s for each late element. -Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events (agenda events) not completed yet -Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Delay tolerance (in days) before alert on project not closed in time -Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks (project tasks) not completed yet -Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not processed yet -Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on purchase orders not processed yet -Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay tolerance (in days) before alert on proposals to close -Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay tolerance (in days) before alert on proposals not billed -Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerance delay (in days) before alert on services to activate -Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerance delay (in days) before alert on expired services -Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerance delay (in days) before alert on unpaid supplier invoices -Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerence delay (in days) before alert on unpaid client invoices -Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance delay (in days) before alert on pending bank reconciliation -Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed membership fee -Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do -Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve -SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr. -SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu): -SetupDescription3=Settings in menu %s -> %s. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example). -SetupDescription4=Settings in menu %s -> %s. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate. -SetupDescription5=Other menu entries manage optional parameters. +DelaysOfToleranceBeforeWarning=Delays before displaying an alert warning +DelaysOfToleranceDesc=This screen allows you to define the delay before an alert is reported onscreen with a %s icon for each late element. +Delays_MAIN_DELAY_ACTIONS_TODO=Delay (in days) before alert on planned events (agenda events) not completed yet +Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Delay (in days) before alert on project not closed in time +Delays_MAIN_DELAY_TASKS_TODO=Delay (in days) before alert on planned tasks (project tasks) not completed yet +Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay (in days) before alert on orders not processed yet +Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay (in days) before alert on purchase orders not processed yet +Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay (in days) before alert on proposals to close +Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay (in days) before alert on proposals not billed +Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Delay (in days) before alert on services to activate +Delays_MAIN_DELAY_RUNNING_SERVICES=Delay (in days) before alert on expired services +Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Delay (in days) before alert on unpaid supplier invoices +Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Delay (in days) before alert on unpaid client invoices +Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Delay (in days) before alert on pending bank reconciliation +Delays_MAIN_DELAY_MEMBERS=Delay (in days) before alert on delayed membership fee +Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Delay (in days) before alert for cheque deposit to do +Delays_MAIN_DELAY_EXPENSEREPORTS=Delay (in days) before alert for expense reports to approve +SetupDescription1=Before starting to use Dolibarr some initial parameters must be defined and modules enabled/configured. +SetupDescription2=The following two sections are compulsory (the two first entries in the Setup menu on the left): +SetupDescription3=%s -> %s
Basic parameters used to customize the default behavior of Dolibarr (e.g for country-related features). +SetupDescription4=%s -> %s
Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module. +SetupDescription5=Other Setup menu entries manage optional parameters. LogEvents=Security audit events Audit=Audit InfoDolibarr=About Dolibarr @@ -1061,8 +1063,8 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin AreaForAdminOnly=Setup parameters can be set by administrator users only. SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only. SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit. -CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page) -AccountantDesc=Edit on this page all known information about your accountant/bookkeeper +CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page. +AccountantDesc=Edit the details of your accountant/bookkeeper AccountantFileNumber=File number DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here AvailableModules=Available app/modules @@ -1070,7 +1072,7 @@ ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules). SessionTimeOut=Time out for session SessionExplanation=This number guarantee that session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guaranty that session will expire just after this delay. It will expire, after this delay, and when the session cleaner is ran, so every %s/%s access, but only during access made by other sessions.
Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by the default session.gc_maxlifetime, no matter what the value entered here. TriggersAvailable=Available triggers -TriggersDesc=Triggers are files that will modify the behaviour of Dolibarr workflow once copied into the directory htdocs/core/triggers. They realised new actions, activated on Dolibarr events (new company creation, invoice validation, ...). +TriggersDesc=Triggers are files that will modify the behavior of Dolibarr workflow once copied into the directory htdocs/core/triggers. They realize new actions, activated on Dolibarr events (new company creation, invoice validation, ...). TriggerDisabledByName=Triggers in this file are disabled by the -NORUN suffix in their name. TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module %s is disabled. TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules. @@ -1080,7 +1082,7 @@ DictionaryDesc=Insert all reference data. You can add your values to the default ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options check here. MiscellaneousDesc=All other security related parameters are defined here. LimitsSetup=Limits/Precision setup -LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here +LimitsDesc=You can define limits, precisions and optimizations used by Dolibarr here MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices MAIN_MAX_DECIMALS_TOT=Max decimals for total prices MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add ... after this number if you want to see ... when number is truncated when shown on screen) @@ -1089,16 +1091,16 @@ UnitPriceOfProduct=Net unit price of a product TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding ParameterActiveForNextInputOnly=Parameter effective for next input only NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page. -NoEventFoundWithCriteria=No security event has been found for such search criterias. +NoEventFoundWithCriteria=No security event has been found for this search criteria. SeeLocalSendMailSetup=See your local sendmail setup BackupDesc=To make a complete backup of Dolibarr, you must: BackupDesc2=Save content of documents directory (%s) that contains all uploaded and generated files (So it includes all dump files generated at step 1). BackupDesc3=Save content of your database (%s) into a dump file. For this, you can use following assistant. BackupDescX=Archived directory should be stored in a secure place. BackupDescY=The generated dump file should be stored in a secure place. -BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one +BackupPHPWarning=Backup cannot be guaranteed with this method. Prefer previous one RestoreDesc=To restore a Dolibarr backup, you must: -RestoreDesc2=Restore archive file (zip file for example) of documents directory to extract tree of files in documents directory of a new Dolibarr installation or into this current documents directoy (%s). +RestoreDesc2=Restore archive file (zip file for example) of documents directory to extract tree of files in documents directory of a new Dolibarr installation or into this current documents directory (%s). RestoreDesc3=Restore the data, from a backup dump file, into the database of the new Dolibarr installation or into the database of this current installation (%s). Warning, once restore is finished, you must use a login/password, that existed when backup was made, to connect again. To restore a backup database into this current installation, you can follow this assistant. RestoreMySQL=MySQL import ForcedToByAModule= This rule is forced to %s by an activated module @@ -1109,24 +1111,24 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP DownloadMoreSkins=More skins to download SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence without hole and with no reset -ShowProfIdInAddress=Show professionnal id with addresses on documents -ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents +ShowProfIdInAddress=Show professional id with addresses on documents +ShowVATIntaInAddress=Hide intra-Community VAT number with addresses on documents TranslationUncomplete=Partial translation -MAIN_DISABLE_METEO=Disable meteo view +MAIN_DISABLE_METEO=Disable meteorological view MeteoStdMod=Standard mode MeteoStdModEnabled=Standard mode enabled MeteoPercentageMod=Percentage mode MeteoPercentageModEnabled=Percentage mode enabled MeteoUseMod=Click to use %s TestLoginToAPI=Test login to API -ProxyDesc=Some features of Dolibarr need to have an Internet access to work. Define here parameters for this. If the Dolibarr server is behind a Proxy server, those parameters tells Dolibarr how to access Internet through it. +ProxyDesc=Some features of Dolibarr need to have internet access to work. Define here the parameters for this. If the Dolibarr server is behind a Proxy server, these parameters tell Dolibarr how to access the internet through it. ExternalAccess=External access MAIN_PROXY_USE=Use a proxy server (otherwise direct access to internet) MAIN_PROXY_HOST=Name/Address of proxy server MAIN_PROXY_PORT=Port of proxy server MAIN_PROXY_USER=Login to use the proxy server MAIN_PROXY_PASS=Password to use the proxy server -DefineHereComplementaryAttributes=Define here all attributes, not already available by default, and that you want to be supported for %s. +DefineHereComplementaryAttributes=Define here any attributes not already available by default, that you want to be supported for %s. ExtraFields=Complementary attributes ExtraFieldsLines=Complementary attributes (lines) ExtraFieldsLinesRec=Complementary attributes (templates invoices lines) @@ -1159,24 +1161,24 @@ CurrentTranslationString=Current translation string WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string NewTranslationStringToShow=New translation string to show OriginalValueWas=The original translation is overwritten. Original value was:

%s -TransKeyWithoutOriginalValue=You forced a new translation for the translation key '%s' that does not exists in any language files +TransKeyWithoutOriginalValue=You forced a new translation for the translation key '%s' that does not exist in any language files TotalNumberOfActivatedModules=Activated application/modules: %s / %s YouMustEnableOneModule=You must at least enable 1 module ClassNotFoundIntoPathWarning=Class %s not found into PHP path YesInSummer=Yes in summer -OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted: +OnlyFollowingModulesAreOpenedToExternalUsers=Note, only the following modules are opened to external users (whatever the permissions of such users) and only if permissions are granted: SuhosinSessionEncrypt=Session storage encrypted by Suhosin ConditionIsCurrently=Condition is currently %s YouUseBestDriver=You use driver %s that is best driver available currently. -YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. -NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization. +YouDoNotUseBestDriver=You use driver %s but driver %s is recommended. +NbOfProductIsLowerThanNoPb=You have only %s products/services in the database. This does not require any particular optimization. SearchOptim=Search optimization YouHaveXProductUseSearchOptim=You have %s product into database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 into Home-Setup-Other, you limit the search to the beginning of strings making possible for database to use index and you should get an immediate response. -BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance. -BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari. +BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance. +BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari. XDebugInstalled=XDebug is loaded. XCacheInstalled=XCache is loaded. -AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp". +AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appear with name "CC12345 - SC45678 - The big company coorp", instead of "The big company corp". AskForPreferredShippingMethod=Ask for preferred Sending Method for Third Parties. FieldEdition=Edition of field %s FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) @@ -1344,11 +1346,11 @@ LDAPTestSynchroMemberType=Test member type synchronization LDAPTestSearch= Test a LDAP search LDAPSynchroOK=Synchronization test successful LDAPSynchroKO=Failed synchronization test -LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that connexion to server is correctly configured and allows LDAP udpates +LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that the connection to the server is correctly configured and allows LDAP updates LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s) LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s) -LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s) -LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s) +LDAPBindOK=Connect/Authenticate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s) +LDAPBindKO=Connect/Authenticate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s) LDAPSetupForVersion3=LDAP server configured for version 3 LDAPSetupForVersion2=LDAP server configured for version 2 LDAPDolibarrMapping=Dolibarr Mapping @@ -1410,26 +1412,26 @@ LDAPDescMembersTypes=This page allows you to define LDAP attributes name in LDAP LDAPDescValues=Example values are designed for OpenLDAP with following loaded schemas: core.schema, cosine.schema, inetorgperson.schema). If you use thoose values and OpenLDAP, modify your LDAP config file slapd.conf to have all thoose schemas loaded. ForANonAnonymousAccess=For an authenticated access (for a write access for example) PerfDolibarr=Performance setup/optimizing report -YouMayFindPerfAdviceHere=You will find on this page some checks or advices related to performance. +YouMayFindPerfAdviceHere=You will find on this page some checks or advice related to performance. NotInstalled=Not installed, so your server is not slow down by this. ApplicativeCache=Applicative cache MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.
More information here http://wiki.dolibarr.org/index.php/Module_MemCached_EN.
Note that a lot of web hosting provider does not provide such cache server. MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete. MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled. OPCodeCache=OPCode cache -NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad). +NoOPCodeCacheFound=No OPCode cache found. Maybe you are using an OPCode cache other than XCache or eAccelerator (good), or maybe you don't have OPCode cache (very bad). HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript) FilesOfTypeCached=Files of type %s are cached by HTTP server FilesOfTypeNotCached=Files of type %s are not cached by HTTP server FilesOfTypeCompressed=Files of type %s are compressed by HTTP server FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server CacheByServer=Cache by server -CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000" +CacheByServerDesc=For example using the Apache directive "ExpiresByType image/gif A2592000" CacheByClient=Cache by browser CompressionOfResources=Compression of HTTP responses -CompressionOfResourcesDesc=For exemple using the Apache directive "AddOutputFilterByType DEFLATE" +CompressionOfResourcesDesc=For example using the Apache directive "AddOutputFilterByType DEFLATE" TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers -DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record. +DefaultValuesDesc=You can define/force here the default value you want to get when you create a new record, and/or default filters or sort order when your list record. DefaultCreateForm=Default values (on forms to create) DefaultSearchFilters=Default search filters DefaultSortOrder=Default sort orders @@ -1442,7 +1444,7 @@ NumberOfProductShowInSelect=Max number of products in combos select lists (0=no ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip) MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the language of the third party -UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. +UseSearchToSelectProductTooltip=Also if you have a large number of products (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectProduct=Wait you press a key before loading content of product combo list (This may increase performance if you have a large number of products, but it is less convenient) SetDefaultBarcodeTypeProducts=Default barcode type to use for products SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties @@ -1504,7 +1506,7 @@ SendingsSetup=Sending module setup SendingsReceiptModel=Sending receipt model SendingsNumberingModules=Sendings numbering modules SendingsAbility=Support shipping sheets for customer deliveries -NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated. +NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that are received and signed by customer. Hence the product deliveries receipt is a duplicated feature and is rarely activated. FreeLegalTextOnShippings=Free text on shipments ##### Deliveries ##### DeliveryOrderNumberingModules=Products deliveries receipt numbering module @@ -1516,18 +1518,18 @@ AdvancedEditor=Advanced editor ActivateFCKeditor=Activate advanced editor for: FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services) FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing) FCKeditorForUserSignature=WYSIWIG creation/edition of user signature FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) ##### OSCommerce 1 ##### -OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be an OSCommerce database (Key %s not found in table %s). -OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' successfull. +OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database does not appear to be an OSCommerce database (Key %s not found in table %s). +OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' successful. OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached. OSCommerceTestKo2=Connection to server '%s' with user '%s' failed. ##### Stock ##### StockSetup=Stock module setup -IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. +IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup. ##### Menu ##### MenuDeleted=Menu deleted Menus=Menus @@ -1549,7 +1551,7 @@ DetailRight=Condition to display unauthorized grey menus DetailLangs=Lang file name for label code translation DetailUser=Intern / Extern / All Target=Target -DetailTarget=Target for links (_blank top open a new window) +DetailTarget=Target for links (_blank top opens a new window) DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu) ModifMenu=Menu change DeleteMenu=Delete menu entry @@ -1564,7 +1566,7 @@ OptionVatDefaultDesc=VAT is due:
- on delivery for goods (we use invoice date OptionVatDebitOptionDesc=VAT is due:
- on delivery for goods (we use invoice date)
- on invoice (debit) for services OptionPaymentForProductAndServices=Cash basis for products and services OptionPaymentForProductAndServicesDesc=VAT is due:
- on payment for goods
- on payments for services -SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option: +SummaryOfVatExigibilityUsedByDefault=Time of VAT eligibility by default according to chosen option: OnDelivery=On delivery OnPayment=On payment OnInvoice=On invoice @@ -1587,7 +1589,7 @@ AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filt AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). Note: Module %s must be enabled and correctly setup to have reminder sent at the correct frequency. -AGENDA_REMINDER_BROWSER=Enable event reminder on users browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### @@ -1595,7 +1597,7 @@ ClickToDialSetup=Click To Dial module setup ClickToDialUrlDesc=Url called when a click on phone picto is done. In URL, you can use tags
__PHONETO__ that will be replaced with the phone number of person to call
__PHONEFROM__ that will be replaced with phone number of calling person (yours)
__LOGIN__ that will be replaced with clicktodial login (defined on user card)
__PASS__ that will be replaced with clicktodial password (defined on user card). ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to call the phone number. This can be used to call a call center system from Dolibarr that can call the phone number on a SIP system for example. ClickToDialUseTelLink=Use just a link "tel:" on phone numbers -ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field. +ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that start with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field. ##### Point Of Sales (CashDesk) ##### CashDesk=Point of sales CashDeskSetup=Point of sales module setup @@ -1607,10 +1609,10 @@ CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management -CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. +CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sale from Point Of Sale. Hence a warehouse is required. ##### Bookmark ##### BookmarkSetup=Bookmark module setup -BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu. +BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or external web sites on your left menu. NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu ##### WebServices ##### WebServicesSetup=Webservices module setup @@ -1638,7 +1640,7 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module MultiCompanySetup=Multi-company module setup ##### Suppliers ##### SuppliersSetup=Supplier module setup -SuppliersCommandModel=Complete template of prchase order (logo...) +SuppliersCommandModel=Complete template of purchase order (logo...) SuppliersInvoiceModel=Complete template of vendor invoice (logo...) SuppliersInvoiceNumberingModel=Supplier invoices numbering models IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval @@ -1655,7 +1657,7 @@ ProjectsSetup=Project module setup ProjectsModelModule=Project reports document model TasksNumberingModules=Tasks numbering module TaskModelModule=Tasks reports document model -UseSearchToSelectProject=Wait you press a key before loading content of project combo list (This may increase performance if you have a large number of project, but it is less convenient) +UseSearchToSelectProject=Wait until you press a key before loading content of project combo list (this may improve performance if you have a large number of projects, but it is less convenient) ##### ECM (GED) ##### ##### Fiscal Year ##### AccountingPeriods=Accounting periods @@ -1713,13 +1715,13 @@ BackgroundTableLineEvenColor=Background color for even table lines MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay) NbAddedAutomatically=Number of days added to counters of users (automatically) each month EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters. -UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364] +UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364] ColorFormat=The RGB color is in HEX format, eg: FF0000 PositionIntoComboList=Position of line into combo lists SellTaxRate=Sale tax rate RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases. UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipping, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card. -OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated by this rate to evaluate global amount all your opportunities may generate. Value is percent (between 0 and 100). +OpportunityPercent=When you create an opportunity, you will define an estimated amount of project/lead. According to status of opportunity, this amount may be multiplied by this rate to evaluate global amount all your opportunities may generate. Value is percent (between 0 and 100). TemplateForElement=This template record is dedicated to which element TypeOfTemplate=Type of template TemplateIsVisibleByOwnerOnly=Template is visible by owner only @@ -1749,7 +1751,7 @@ TitleExampleForMajorRelease=Example of message you can use to announce this majo TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites) ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read ChangeLog for complete list of changes. ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read ChangeLog for complete list of changes. -MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases. +MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be useful only if your prices for each level are relative to first level. You can ignore this page in most cases. ModelModulesProduct=Templates for product documents ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number. SeeSubstitutionVars=See * note for list of possible substitution variables @@ -1774,8 +1776,8 @@ AddSubstitutions=Add keys substitutions DetectionNotPossible=Detection not possible UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved on database user table and must be provided on each API call) ListOfAvailableAPIs=List of available APIs -activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise -CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter $dolibarr_main_restrict_os_commands into conf.php file. +activateModuleDependNotSatisfied=Module "%s" depends on module "%s", that is missing, so module "%1$s" may not work correctly. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise +CommandIsNotInsideAllowedCommands=The command you try to run is not in the list of allowed commands defined into parameter $dolibarr_main_restrict_os_commands in the conf.php file. LandingPage=Landing page SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users or groups manually if necessary. @@ -1784,13 +1786,13 @@ TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta i BaseCurrency=Reference currency of the company (go into setup of company to change this) WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with french laws (Loi Finance 2016). WarningNoteModulePOSForFrenchLaw=This module %s is compliant with french laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated. -WarningInstallationMayBecomeNotCompliantWithLaw=You try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software. +WarningInstallationMayBecomeNotCompliantWithLaw=You are trying to install module %s that is an external module. Activating an external module means you trust the publisher of that module and that you are sure that this module does not impact adversely the behavior of your application, and is compliant with laws of your country (%s). If the module introduces an illegal feature, you become responsible for the use of a illegal software. MAIN_PDF_MARGIN_LEFT=Left margin on PDF MAIN_PDF_MARGIN_RIGHT=Right margin on PDF MAIN_PDF_MARGIN_TOP=Top margin on PDF MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups -EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2') +EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2') SeveralLangugeVariatFound=Several language variants found COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX) diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang index f95d0e18bf4..ac5ba91bbec 100644 --- a/htdocs/langs/en_US/banks.lang +++ b/htdocs/langs/en_US/banks.lang @@ -153,7 +153,7 @@ RejectCheckDate=Date the check was returned CheckRejected=Check returned CheckRejectedAndInvoicesReopened=Check returned and invoices reopened BankAccountModelModule=Document templates for bank accounts -DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only. +DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only. DocumentModelBan=Template to print a page with BAN information. NewVariousPayment=New miscellaneous payments VariousPayment=Miscellaneous payments diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 7a260e6dbc6..0768f8c9999 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -91,7 +91,7 @@ PaymentConditionsShort=Payment terms PaymentAmount=Payment amount ValidatePayment=Validate payment PaymentHigherThanReminderToPay=Payment higher than reminder to pay -HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay.
Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices. +HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay.
Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoice. HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay.
Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice. ClassifyPaid=Classify 'Paid' ClassifyPaidPartially=Classify 'Paid partially' @@ -141,7 +141,7 @@ BillShortStatusNotRefunded=Not refunded BillShortStatusClosedUnpaid=Closed BillShortStatusClosedPaidPartially=Paid (partially) PaymentStatusToValidShort=To validate -ErrorVATIntraNotConfigured=Intracommunautary VAT number not yet defined +ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined ErrorNoPaiementModeConfigured=No default payment mode defined. Go to Invoice module setup to fix this. ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment modes ErrorBillNotFound=Invoice %s does not exist @@ -150,7 +150,7 @@ ErrorDiscountAlreadyUsed=Error, discount already used ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have a positive amount ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status -ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed. +ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed. BillFrom=From BillTo=To ActionsOnBill=Actions on invoice @@ -180,14 +180,14 @@ ConfirmCancelBill=Are you sure you want to cancel invoice %s? ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? -ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularize the VAT with a credit note. ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason -ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice have been provided with suitable comment. (Example «Only the tax corresponding to the price that have been actually paid gives rights to deduction») +ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comment. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction») ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct note. ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A bad customer is a customer that refuse to pay his debt. @@ -304,7 +304,7 @@ SupplierDiscounts=Vendors discounts BillAddress=Bill address HelpEscompte=This discount is a discount granted to customer because its payment was made before term. HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose. -HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example) +HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example) IdSocialContribution=Social/fiscal tax payment id PaymentId=Payment id PaymentRef=Payment ref. @@ -325,7 +325,7 @@ DescTaxAndDividendsArea=This area presents a summary of all payments made for sp NbOfPayments=Nb of payments SplitDiscount=Split discount in two ConfirmSplitDiscount=Are you sure you want to split this discount of %s %s into 2 lower discounts? -TypeAmountOfEachNewDiscount=Input amount for each of two parts : +TypeAmountOfEachNewDiscount=Input amount for each of two parts: TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to original discount amount. ConfirmRemoveDiscount=Are you sure you want to remove this discount? RelatedBill=Related invoice @@ -336,7 +336,7 @@ LatestRelatedBill=Latest related invoice WarningBillExist=Warning, one or more invoice already exist MergingPDFTool=Merging PDF tool AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice -PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company +PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company PaymentNote=Payment note ListOfPreviousSituationInvoices=List of previous situation invoices ListOfNextSituationInvoices=List of next situation invoices @@ -416,11 +416,11 @@ PaymentTypeFAC=Factor PaymentTypeShortFAC=Factor BankDetails=Bank details BankCode=Bank code -DeskCode=Desk code +DeskCode=Office code BankAccountNumber=Account number -BankAccountNumberKey=Key +BankAccountNumberKey=Check digits Residence=Direct debit -IBANNumber=IBAN number +IBANNumber=IBAN complete account number IBAN=IBAN BIC=BIC/SWIFT BICNumber=BIC/SWIFT number diff --git a/htdocs/langs/en_US/blockedlog.lang b/htdocs/langs/en_US/blockedlog.lang index 9f6a49a5146..d2acd9873cb 100644 --- a/htdocs/langs/en_US/blockedlog.lang +++ b/htdocs/langs/en_US/blockedlog.lang @@ -2,13 +2,13 @@ BlockedLog=Unalterable Logs Field=Field BlockedLogDesc=This module tracks some events into an unalterable log (that you can't modify once recorded) into a block chain, in real time. This module provides compatibility with requirements of laws of some countries (like France with the law Finance 2016 - Norme NF535). Fingerprints=Archived events and fingerprints -FingerprintsDesc=This is the tool to browse or extract the unalterable logs. Unalterable logs are generated and archived locally into a dedicated table, in real time when you record a business event. You can use this tool to export this archive and save it into an external support (some countries, like France, ask you do it every year). Note that, there is no feature to purge this log and every change tried to be done directly into this log (by a hacker for example) will be reported with a non valid fingerprint. If you really need to purge this table because you used your application for a demo/test purpose and want to clean your data to start your production, you can ask your reseller or integrator to reset your database (all your data will be removed). +FingerprintsDesc=This is the tool to browse or extract the unalterable logs. Unalterable logs are generated and archived locally into a dedicated table, in real time when you record a business event. You can use this tool to export this archive and save it into an external support (some countries, like France, ask that you do it every year). Note that, there is no feature to purge this log and every change tried to be done directly into this log (by a hacker for example) will be reported with a non-valid fingerprint. If you really need to purge this table because you used your application for a demo/test purpose and want to clean your data to start your production, you can ask your reseller or integrator to reset your database (all your data will be removed). CompanyInitialKey=Company initial key (hash of genesis block) BrowseBlockedLog=Unalterable logs ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long) -ShowAllFingerPrintsErrorsMightBeTooLong=Show all non valid archive logs (might be long) +ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long) DownloadBlockChain=Download fingerprints -KoCheckFingerprintValidity=Archived log is not valid. It means someone (a hacker ?) has modified some datas of this archived log after it was recorded, or has erased the previous archived record (check that line with previous # exists). +KoCheckFingerprintValidity=Archived log is not valid. It means someone (a hacker?) has modified some datas of this archived log after it was recorded, or has erased the previous archived record (check that line with previous # exists). OkCheckFingerprintValidity=Archived log is valid. It means all data on this line were not modified and record follow the previous one. OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously. AddedByAuthority=Stored into remote authority @@ -23,7 +23,7 @@ logPAYMENT_CUSTOMER_DELETE=Customer payment logical deletion logDONATION_PAYMENT_CREATE=Donation payment created logDONATION_PAYMENT_DELETE=Donation payment logical deletion logBILL_PAYED=Customer invoice payed -logBILL_UNPAYED=Customer invoice set unpayed +logBILL_UNPAYED=Customer invoice set unpaid logBILL_VALIDATE=Customer invoice validated logBILL_SENTBYMAIL=Customer invoice send by mail logBILL_DELETE=Customer invoice logically deleted @@ -32,9 +32,9 @@ logMODULE_SET=Module BlockedLog was enabled logDON_VALIDATE=Donation validated logDON_MODIFY=Donation modified logDON_DELETE=Donation logical deletion -logMEMBER_SUBSCRIPTION_CREATE=Member subcription created -logMEMBER_SUBSCRIPTION_MODIFY=Member subcription modified -logMEMBER_SUBSCRIPTION_DELETE=Member subcription logical deletion +logMEMBER_SUBSCRIPTION_CREATE=Member subscription created +logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified +logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion BlockedLogBillDownload=Customer invoice download BlockedLogBillPreview=Customer invoice preview BlockedlogInfoDialog=Log Details @@ -46,8 +46,8 @@ logDOC_DOWNLOAD=Download of a validated document in order to print or send DataOfArchivedEvent=Full datas of archived event ImpossibleToReloadObject=Original object (type %s, id %s) not linked (see 'Full datas' column to get unalterable saved data) BlockedLogAreRequiredByYourCountryLegislation=Unalterable Logs module may be required by the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they can not be validated by a tax audit. -BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Unalterable Logs module was activated because of the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they can not be validated by a tax audit. +BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Unalterable Logs module was activated because of the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they cannot be validated by a tax audit. BlockedLogDisableNotAllowedForCountry=List of countries where usage of this module is mandatory (just to prevent to disable the module by error, if your country is in this list, disable of module is not possible without editing this list first. Note also that enabling/disabling this module will keep a track into the unalterable log). -OnlyNonValid=Non valid +OnlyNonValid=Non-valid TooManyRecordToScanRestrictFilters=Too many record to scan/analyze. Please restrict list with more restrictive filters. RestrictYearToExport=Restrict year to export \ No newline at end of file diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang index f5e1ee8f366..8b3b309dc19 100644 --- a/htdocs/langs/en_US/boxes.lang +++ b/htdocs/langs/en_US/boxes.lang @@ -45,7 +45,7 @@ BoxTitleLastModifiedExpenses=Latest %s modified expense reports BoxGlobalActivity=Global activity (invoices, proposals, orders) BoxGoodCustomers=Good customers BoxTitleGoodCustomers=%s Good customers -FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successfull refresh date: %s +FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s LastRefreshDate=Latest refresh date NoRecordedBookmarks=No bookmarks defined. ClickToAdd=Click here to add. diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang index 1f51f375e89..e5cf5beaf88 100644 --- a/htdocs/langs/en_US/cashdesk.lang +++ b/htdocs/langs/en_US/cashdesk.lang @@ -30,5 +30,5 @@ 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. +UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock. DolibarrReceiptPrinter=Dolibarr Receipt Printer diff --git a/htdocs/langs/en_US/commercial.lang b/htdocs/langs/en_US/commercial.lang index 9f2e16857de..97b8c68fd9b 100644 --- a/htdocs/langs/en_US/commercial.lang +++ b/htdocs/langs/en_US/commercial.lang @@ -72,8 +72,8 @@ StatusProsp=Prospect status DraftPropals=Draft commercial proposals NoLimit=No limit ToOfferALinkForOnlineSignature=Link for online signature -WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s +WelcomeOnOnlineSignaturePage=Welcome on the page to accept commercial proposals from %s ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse -SignatureProposalRef=Signature of quote/commerical proposal %s +SignatureProposalRef=Signature of quote/commercial proposal %s FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled \ No newline at end of file diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index b3e1e7b6c86..87412f5f350 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -27,11 +27,11 @@ CompanyName=Company name AliasNames=Alias name (commercial, trademark, ...) AliasNameShort=Alias name Companies=Companies -CountryIsInEEC=Country is inside European Economic Community +CountryIsInEEC=Country is inside the European Economic Community ThirdPartyName=Third party name ThirdPartyEmail=Third party email ThirdParty=Third party -ThirdParties=Third parties +ThirdParties=Third Parties ThirdPartyProspects=Prospects ThirdPartyProspectsStats=Prospects ThirdPartyCustomers=Customers @@ -40,7 +40,7 @@ ThirdPartyCustomersWithIdProf12=Customers with %s or %s ThirdPartySuppliers=Vendors ThirdPartyType=Third party type Individual=Private individual -ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough. +ToCreateContactWithSameName=Will create automatically a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough. ParentCompany=Parent company Subsidiaries=Subsidiaries ReportByMonth=Report by month @@ -77,10 +77,10 @@ Web=Web Poste= Position DefaultLang=Language by default VATIsUsed=Sales tax is used -VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers +VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers VATIsNotUsed=Sales tax is not used CopyAddressFromSoc=Fill address with third party address -ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects +ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available referring objects ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available PaymentBankAccount=Payment bank account OverAllProposals=Proposals @@ -258,7 +258,7 @@ ProfId1DZ=RC ProfId2DZ=Art. ProfId3DZ=NIF ProfId4DZ=NIS -VATIntra=Sales tax ID +VATIntra=Sales Tax/VAT ID VATIntraShort=Tax ID VATIntraSyntaxIsValid=Syntax is valid VATReturn=VAT return @@ -311,12 +311,12 @@ CustomerCodeDesc=Customer code, unique for all customers SupplierCodeDesc=Vendor code, unique for all vendors RequiredIfCustomer=Required if third party is a customer or prospect RequiredIfSupplier=Required if third party is a vendor -ValidityControledByModule=Validity controled by module +ValidityControledByModule=Validity controlled by module ThisIsModuleRules=This is rules for this module ProspectToContact=Prospect to contact CompanyDeleted=Company "%s" deleted from database. ListOfContacts=List of contacts/addresses -ListOfContactsAddresses=List of contacts/adresses +ListOfContactsAddresses=List of contacts/addresses ListOfThirdParties=List of third parties ShowCompany=Show third party ShowContact=Show contact @@ -340,13 +340,13 @@ CapitalOf=Capital of %s EditCompany=Edit company ThisUserIsNot=This user is not a prospect, customer nor vendor VATIntraCheck=Check -VATIntraCheckDesc=The link %s allows to ask the european VAT checker service. An external internet access from server is required for this service to work. +VATIntraCheckDesc=The link %s uses the European VAT checker service (VIES). An external internet access from server is required for this service to work. VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do -VATIntraCheckableOnEUSite=Check Intracomunnautary VAT on European commision site -VATIntraManualCheck=You can also check manually from european web site %s +VATIntraCheckableOnEUSite=Check intra-Community VAT on the European Commission website +VATIntraManualCheck=You can also check manually on the European Commission website %s ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s). NorProspectNorCustomer=Nor prospect, nor customer -JuridicalStatus=Legal form +JuridicalStatus=Legal Entity Type Staff=Staff ProspectLevelShort=Potential ProspectLevel=Prospect potential @@ -402,9 +402,9 @@ DeleteFile=Delete file ConfirmDeleteFile=Are you sure you want to delete this file? AllocateCommercial=Assigned to sales representative Organization=Organization -FiscalYearInformation=Information on the fiscal year +FiscalYearInformation=Fiscal Year FiscalMonthStart=Starting month of the fiscal year -YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him. +YouMustAssignUserMailFirst=You must create an email for this user prior to being able to add an email notification. YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party ListSuppliersShort=List of vendors ListProspectsShort=List of prospects @@ -420,12 +420,12 @@ CurrentOutstandingBill=Current outstanding bill OutstandingBill=Max. for outstanding bill OutstandingBillReached=Max. for outstanding bill reached OrderMinAmount=Minimum amount for order -MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0. +MonkeyNumRefModelDesc=Return a number with the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor 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...) MergeOriginThirdparty=Duplicate third party (third party you want to delete) MergeThirdparties=Merge third parties -ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the thirdparty will be deleted. +ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one? All linked objects (invoices, orders, ...) will be moved to current third party, then the third party will be deleted. ThirdpartiesMergeSuccess=Third parties have been merged SaleRepresentativeLogin=Login of sales representative SaleRepresentativeFirstname=First name of sales representative diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang index 1b1748f90a1..81c8aadf7c8 100644 --- a/htdocs/langs/en_US/compta.lang +++ b/htdocs/langs/en_US/compta.lang @@ -229,9 +229,9 @@ ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup) ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties -ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined. +ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accounting account on third party is not defined. ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties -ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined. +ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accounting account on third party is not defined. CloneTax=Clone a social/fiscal tax ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment CloneTaxForNextMonth=Clone it for next month @@ -248,7 +248,7 @@ ErrorBankAccountNotFound=Error: Bank account not found FiscalPeriod=Accounting period ListSocialContributionAssociatedProject=List of social contributions associated with the project DeleteFromCat=Remove from accounting group -AccountingAffectation=Accounting assignement +AccountingAffectation=Accounting assignment LastDayTaxIsRelatedTo=Last day of period the tax is related to VATDue=Sale tax claimed ClaimedForThisPeriod=Claimed for the period diff --git a/htdocs/langs/en_US/contracts.lang b/htdocs/langs/en_US/contracts.lang index 3768cfb9ff1..017e02d855e 100644 --- a/htdocs/langs/en_US/contracts.lang +++ b/htdocs/langs/en_US/contracts.lang @@ -67,7 +67,7 @@ CloseService=Close service BoardRunningServices=Expired running services ServiceStatus=Status of service DraftContracts=Drafts contracts -CloseRefusedBecauseOneServiceActive=Contract can't be closed as ther is at least one open service on it +CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it ActivateAllContracts=Activate all contract lines CloseAllContracts=Close all contract lines DeleteContractLine=Delete a contract line diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang index 243d089a2b1..43fe8aecc36 100644 --- a/htdocs/langs/en_US/cron.lang +++ b/htdocs/langs/en_US/cron.lang @@ -12,7 +12,7 @@ OrToLaunchASpecificJob=Or to check and launch a specific job KeyForCronAccess=Security key for URL to launch cron jobs FileToLaunchCronJobs=Command line to check and launch qualified cron jobs CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes -CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes +CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes CronMethodDoesNotExists=Class %s does not contains any method %s CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s. CronJobProfiles=List of predefined cron job profiles @@ -61,11 +61,11 @@ CronStatusInactiveBtn=Disable CronTaskInactive=This job is disabled CronId=Id CronClassFile=Filename with class -CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for module is
product -CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory).
For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/product.class.php, the value for class file name is
product/class/product.class.php -CronObjectHelp=The object name to load.
For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is
Product -CronMethodHelp=The object method to launch.
For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is
fetch -CronArgsHelp=The method arguments.
For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be
0, ProductRef +CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for module is
product +CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory).
For example to call the fetch method of Dolibarr Product object htdocs/product/class/product.class.php, the value for class file name is
product/class/product.class.php +CronObjectHelp=The object name to load.
For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is
Product +CronMethodHelp=The object method to launch.
For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is
fetch +CronArgsHelp=The method arguments.
For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be
0, ProductRef CronCommandHelp=The system command line to execute. CronCreateJob=Create new Scheduled Job CronFrom=From diff --git a/htdocs/langs/en_US/dict.lang b/htdocs/langs/en_US/dict.lang index 81f62469896..9a8ee71106b 100644 --- a/htdocs/langs/en_US/dict.lang +++ b/htdocs/langs/en_US/dict.lang @@ -116,7 +116,7 @@ CountryHM=Heard Island and McDonald CountryVA=Holy See (Vatican City State) CountryHN=Honduras CountryHK=Hong Kong -CountryIS=Icelande +CountryIS=Iceland CountryIN=India CountryID=Indonesia CountryIR=Iran @@ -131,7 +131,7 @@ CountryKI=Kiribati CountryKP=North Korea CountryKR=South Korea CountryKW=Kuwait -CountryKG=Kyrghyztan +CountryKG=Kyrgyzstan CountryLA=Lao CountryLV=Latvia CountryLB=Lebanon @@ -160,7 +160,7 @@ CountryMD=Moldova CountryMN=Mongolia CountryMS=Monserrat CountryMZ=Mozambique -CountryMM=Birmania (Myanmar) +CountryMM=Myanmar (Burma) CountryNA=Namibia CountryNR=Nauru CountryNP=Nepal @@ -223,7 +223,7 @@ CountryTO=Tonga CountryTT=Trinidad and Tobago CountryTR=Turkey CountryTM=Turkmenistan -CountryTC=Turks and Cailos Islands +CountryTC=Turks and Caicos Islands CountryTV=Tuvalu CountryUG=Uganda CountryUA=Ukraine @@ -277,7 +277,7 @@ CurrencySingMGA=Ariary CurrencyMUR=Mauritius rupees CurrencySingMUR=Mauritius rupee CurrencyNOK=Norwegian krones -CurrencySingNOK=Norwegian krone +CurrencySingNOK=Norwegian kronas CurrencyTND=Tunisian dinars CurrencySingTND=Tunisian dinar CurrencyUSD=US Dollars diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang index 646414c2fc5..37d9980c806 100644 --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -42,7 +42,7 @@ ErrorBadDateFormat=Value '%s' has wrong date format ErrorWrongDate=Date is not correct! ErrorFailedToWriteInDir=Failed to write in directory %s ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s) -ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities. +ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities. ErrorFieldsRequired=Some required fields were not filled. ErrorSubjectIsRequired=The email topic is required ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter safe_mode is enabled on this PHP, check that Dolibarr php files owns to web server user (or group). @@ -71,15 +71,15 @@ ErrorNoAccountancyModuleLoaded=No accountancy module activated ErrorExportDuplicateProfil=This profile name already exists for this export set. ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete. ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors. -ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "statut not started" if field "done by" is also filled. +ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled. ErrorRefAlreadyExists=Ref used for creation already exists. ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD) -ErrorRecordHasChildren=Failed to delete record since it has some childs. +ErrorRecordHasChildren=Failed to delete record since it has some child records. ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s -ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object. +ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into another object. ErrorModuleRequireJavascript=Javascript must not be disabled to have this feature working. To enable/disable Javascript, go to menu Home->Setup->Display. ErrorPasswordsMustMatch=Both typed passwords must match each other -ErrorContactEMail=A technical error occured. Please, contact administrator to following email %s en provide the error code %s in your message, or even better by adding a screen copy of this page. +ErrorContactEMail=A technical error occured. Please, contact administrator to following email %s and provide the error code %s in your message, or add a screen copy of this page. ErrorWrongValueForField=Wrong value for field number %s (value '%s' does not match regex rule %s) ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s) ErrorFieldRefNotIn=Wrong value for field number %s (value '%s' is not a %s existing ref) @@ -95,7 +95,7 @@ ErrorBadMaskBadRazMonth=Error, bad reset value ErrorMaxNumberReachForThisMask=Max number reach for this mask ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits ErrorSelectAtLeastOne=Error. Select at least one entry. -ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transation that is conciliated +ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transaction that is conciliated ErrorProdIdAlreadyExist=%s is assigned to another third ErrorFailedToSendPassword=Failed to send password ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEXMLLOAD_DEBUG if error messages does not provide enough information. @@ -147,7 +147,7 @@ ErrorPriceExpression5=Unexpected '%s' ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) ErrorPriceExpression8=Unexpected operator '%s' ErrorPriceExpression9=An unexpected error occured -ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression10=Operator '%s' lacks operand ErrorPriceExpression11=Expecting '%s' ErrorPriceExpression14=Division by zero ErrorPriceExpression17=Undefined variable '%s' @@ -174,7 +174,7 @@ ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu) -ErrorSavingChanges=An error has ocurred when saving the changes +ErrorSavingChanges=An error has occurred when saving the changes ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship ErrorFileMustHaveFormat=File must have format %s ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first. @@ -201,7 +201,7 @@ ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped. ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Mass validation is not possible when option to increase/decrease stock is set on this action (you must validate one by one so you can define the warehouse to increase/decrease) ErrorObjectMustHaveStatusDraftToBeValidated=Object %s must have status 'Draft' to be validated. ErrorObjectMustHaveLinesToBeValidated=Object %s must have lines to be validated. -ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Only validated invoices can be sent using the "Send by email" mass action. +ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Only validated invoices can be sent using the "Send by email" mass action. ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a predefined product or not ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before. ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently. @@ -217,9 +217,9 @@ WarningBookmarkAlreadyExists=A bookmark with this title or this target (URL) alr WarningPassIsEmpty=Warning, database password is empty. This is a security hole. You should add a password to your database and change your conf.php file to reflect this. WarningConfFileMustBeReadOnly=Warning, your config file (htdocs/conf/conf.php) can be overwritten by the web server. This is a serious security hole. Modify permissions on file to be in read only mode for operating system user used by Web server. If you use Windows and FAT format for your disk, you must know that this file system does not allow to add permissions on file, so can't be completely safe. WarningsOnXLines=Warnings on %s source record(s) -WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be choosed by default until you check your module setup. +WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be chosen by default until you check your module setup. WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable install/migrate tools by adding a file install.lock into directory %s. Missing this file is a security hole. -WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other setup). +WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other Setup). WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution. WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box. WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). @@ -229,5 +229,5 @@ WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Pleas WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent. WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action. WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language -WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to %s when using the bulk actions on lists +WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to %s when using the mass actions on lists WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report \ No newline at end of file diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang index 4a1152e6581..0642b64dd7f 100644 --- a/htdocs/langs/en_US/exports.lang +++ b/htdocs/langs/en_US/exports.lang @@ -7,33 +7,33 @@ ExportableDatas=Exportable dataset ImportableDatas=Importable dataset SelectExportDataSet=Choose dataset you want to export... SelectImportDataSet=Choose dataset you want to import... -SelectExportFields=Choose fields you want to export, or select a predefined export profile -SelectImportFields=Choose source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile: +SelectExportFields=Choose the fields you want to export, or select a predefined export profile +SelectImportFields=Choose the source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile: NotImportedFields=Fields of source file not imported -SaveExportModel=Save this export profile if you plan to reuse it later... -SaveImportModel=Save this import profile if you plan to reuse it later... +SaveExportModel=Save this export profile (for reuse) ... +SaveImportModel=Save this import profile (for reuse) ... ExportModelName=Export profile name -ExportModelSaved=Export profile saved under name %s. +ExportModelSaved=Export profile saved as %s. ExportableFields=Exportable fields ExportedFields=Exported fields ImportModelName=Import profile name -ImportModelSaved=Import profile saved under name %s. +ImportModelSaved=Import profile saved as %s. DatasetToExport=Dataset to export DatasetToImport=Import file into dataset ChooseFieldsOrdersAndTitle=Choose fields order... FieldsTitle=Fields title FieldTitle=Field title -NowClickToGenerateToBuildExportFile=Now, select file format in combo box and click on "Generate" to build export file... +NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file... AvailableFormats=Available formats LibraryShort=Library Step=Step FormatedImport=Import assistant -FormatedImportDesc1=This area allows to import personalized data, using an assistant to help you in process without technical knowledge. -FormatedImportDesc2=First step is to choose a king of data you want to load, then file to load, then to choose which fields you want to load. +FormatedImportDesc1=This area allows the import of personalized data using an assistant, to help you in the process without technical knowledge. +FormatedImportDesc2=First step is to choose the kind of data you want to import, then the format of the source file, then the fields you want to import. FormatedExport=Export assistant -FormatedExportDesc1=This area allows to export personalized data, using an assistant to help you in process without technical knowledge. -FormatedExportDesc2=First step is to choose a predefined dataset, then to choose which fields you want in your result files, and which order. -FormatedExportDesc3=When data to export are selected, you can define output file format you want to export your data to. +FormatedExportDesc1=These tools allow the export of personalized data using an assistant, to help you in the process without requiring technical knowledge. +FormatedExportDesc2=First step is to choose a predefined dataset, then which fields you want to export, and in which order. +FormatedExportDesc3=When data to export are selected, you can choose the format of the output file. Sheet=Sheet NoImportableData=No importable data (no module with definitions to allow data imports) FileSuccessfullyBuilt=File generated @@ -50,10 +50,10 @@ LineTotalVAT=Amount of VAT for line TypeOfLineServiceOrProduct=Type of line (0=product, 1=service) FileWithDataToImport=File with data to import FileToImport=Source file to import -FileMustHaveOneOfFollowingFormat=File to import must have one of following format +FileMustHaveOneOfFollowingFormat=File to import must have one of following formats DownloadEmptyExample=Download example of empty source file -ChooseFormatOfFileToImport=Choose file format to use as import file format by clicking on picto %s to select it... -ChooseFileToImport=Upload file then click on picto %s to select file as source import file... +ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it... +ChooseFileToImport=Upload file then click on the %s icon to select file as source import file... SourceFileFormat=Source file format FieldsInSourceFile=Fields in source file FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory) @@ -68,7 +68,7 @@ FieldsTarget=Targeted fields FieldTarget=Targeted field FieldSource=Source field NbOfSourceLines=Number of lines in source file -NowClickToTestTheImport=Check import parameters you have defined. If they are correct, click on button "%s" to launch a simulation of import process (no data will be changed in your database, it's only a simulation for the moment)... +NowClickToTestTheImport=Check the import parameters you have defined. If they are correct, click on button "%s" to launch a simulation of the import process (no data will be changed in your database, it's only a simulation)... RunSimulateImportFile=Launch the import simulation FieldNeedSource=This field requires data from the source file SomeMandatoryFieldHaveNoSource=Some mandatory fields have no source from data file @@ -77,36 +77,36 @@ InformationOnTargetTables=Information on target fields SelectAtLeastOneField=Switch at least one source field in the column of fields to export SelectFormat=Choose this import file format RunImportFile=Launch import file -NowClickToRunTheImport=Check result of import simulation. If everything is ok, launch the definitive import. +NowClickToRunTheImport=Check result of import simulation. If everything is ok, launch the real import process. DataLoadedWithId=All data will be loaded with the following import id: %s -ErrorMissingMandatoryValue=Mandatory data is empty in source file for field %s. -TooMuchErrors=There is still %s other source lines with errors but output has been limited. -TooMuchWarnings=There is still %s other source lines with warnings but output has been limited. +ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field %s. +TooMuchErrors=There are still %s other source lines with errors but output has been limited. +TooMuchWarnings=There are still %s other source lines with warnings but output has been limited. EmptyLine=Empty line (will be discarded) -CorrectErrorBeforeRunningImport=You must first correct all errors before running definitive import. +CorrectErrorBeforeRunningImport=You must correct all errors before running the definitive import. FileWasImported=File was imported with number %s. -YouCanUseImportIdToFindRecord=You can find all imported record in your database by filtering on field import_key='%s'. +YouCanUseImportIdToFindRecord=You can find all the imported records in your database by filtering on field import_key='%s'. NbOfLinesOK=Number of lines with no errors and no warnings: %s. NbOfLinesImported=Number of lines successfully imported: %s. DataComeFromNoWhere=Value to insert comes from nowhere in source file. DataComeFromFileFieldNb=Value to insert comes from field number %s in source file. -DataComeFromIdFoundFromRef=Value that comes from field number %s of source file will be used to find id of parent object to use (So the objet %s that has the ref. from source file must exists into Dolibarr). -DataComeFromIdFoundFromCodeId=Code that comes from field number %s of source file will be used to find id of parent object to use (So the code from source file must exists into dictionary %s). Note that if you know id, you can also use it into source file instead of code. Import should work in both cases. +DataComeFromIdFoundFromRef=Value that comes from field number %s of source file will be used to find the id of the parent object to use (so the object %s that has the ref. from source file must exist in the database). +DataComeFromIdFoundFromCodeId=Code that comes from field number %s of source file will be used to find the id of the parent object to use (so the code from source file must exist in the dictionary %s). Note that if you know the id, you can also use it in the source file instead of the code. Import should work in both cases. DataIsInsertedInto=Data coming from source file will be inserted into the following field: -DataIDSourceIsInsertedInto=The id of parent object found using the data in source file, will be inserted into the following field: +DataIDSourceIsInsertedInto=The id of parent object was found using the data in the source file, will be inserted into the following field: DataCodeIDSourceIsInsertedInto=The id of parent line found from code, will be inserted into following field: SourceRequired=Data value is mandatory SourceExample=Example of possible data value ExampleAnyRefFoundIntoElement=Any ref found for element %s ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary %s -CSVFormatDesc=Comma Separated Value file format (.csv).
This is a text file format where fields are separated by separator [ %s ]. If separator is found inside a field content, field is rounded by round character [ %s ]. Escape character to escape round character is [ %s ]. -Excel95FormatDesc=Excel file format (.xls)
This is native Excel 95 format (BIFF5). -Excel2007FormatDesc=Excel file format (.xlsx)
This is native Excel 2007 format (SpreadsheetML). +CSVFormatDesc=Comma Separated Value file format (.csv).
This is a text file format where fields are separated by a separator [ %s ]. If separator is found inside a field content, field is rounded by round character [ %s ]. Escape character to escape round character is [ %s ]. +Excel95FormatDesc=Excel file format (.xls)
This is the native Excel 95 format (BIFF5). +Excel2007FormatDesc=Excel file format (.xlsx)
This is the native Excel 2007 format (SpreadsheetML). TsvFormatDesc=Tab Separated Value file format (.tsv)
This is a text file format where fields are separated by a tabulator [tab]. ExportFieldAutomaticallyAdded=Field %s was automatically added. It will avoid you to have similar lines to be treated as duplicate record (with this field added, all lines will own their own id and will differ). CsvOptions=Csv Options Separator=Separator -Enclosure=Enclosure +Enclosure=Delimiter SpecialCode=Special code ExportStringFilter=%% allows replacing one or more characters in the text ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day
YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days
> YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days
< YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days diff --git a/htdocs/langs/en_US/help.lang b/htdocs/langs/en_US/help.lang index 2ddbc51ce3a..d5a19d6d119 100644 --- a/htdocs/langs/en_US/help.lang +++ b/htdocs/langs/en_US/help.lang @@ -5,9 +5,9 @@ RemoteControlSupport=Online real time / remote support OtherSupport=Other support ToSeeListOfAvailableRessources=To contact/see available resources: HelpCenter=Help center -DolibarrHelpCenter=Dolibarr help and support center -ToGoBackToDolibarr=Otherwise, click here to use Dolibarr -TypeOfSupport=Source of support +DolibarrHelpCenter=Dolibarr Help and Support Center +ToGoBackToDolibarr=Otherwise, click here to continue to use Dolibarr. +TypeOfSupport=Type of support TypeSupportCommunauty=Community (free) TypeSupportCommercial=Commercial TypeOfHelp=Type @@ -15,12 +15,12 @@ NeedHelpCenter=Need help or support? Efficiency=Efficiency TypeHelpOnly=Help only TypeHelpDev=Help+Development -TypeHelpDevForm=Help+Development+Formation -ToGetHelpGoOnSparkAngels1=Some companies can provide a fast (sometime immediate) and more efficient online support by taking control of your computer. Such helpers can be found on %s web site: -ToGetHelpGoOnSparkAngels3=You can also go to the list of all available coaches for Dolibarr, for this click on button -ToGetHelpGoOnSparkAngels2=Sometimes, there is no company available at the moment you make your search, so think to change the filter to look for "all availability". You will be able to send more requests. -BackToHelpCenter=Otherwise, click here to go back to help center home page. -LinkToGoldMember=You can call one of the coach preselected by Dolibarr for your language (%s) by clicking his Widget (status and maximum price are automatically updated): +TypeHelpDevForm=Help+Development+Training +ToGetHelpGoOnSparkAngels1=Some companies can provide a fast (sometime immediate) and more efficient online support by remote control of your computer. Such help can be found on %s web site: +ToGetHelpGoOnSparkAngels3=You can also go to the list of all available trainers for Dolibarr, for this click on button +ToGetHelpGoOnSparkAngels2=Sometimes, there is no company available when you make your search, so change the filter to look for "all availability". You will be able to send more requests. +BackToHelpCenter=Otherwise, go back to Help center home page. +LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated): PossibleLanguages=Supported languages -SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation +SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation 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 eca2bbdfe46..5c9c9e04200 100644 --- a/htdocs/langs/en_US/holiday.lang +++ b/htdocs/langs/en_US/holiday.lang @@ -19,8 +19,8 @@ ListeCP=List of leaves LeaveId=Leave ID ReviewedByCP=Will be approved by UserForApprovalID=User for approval ID -UserForApprovalFirstname=Firstname of approval user -UserForApprovalLastname=Lastname of approval user +UserForApprovalFirstname=First name of approval user +UserForApprovalLastname=Last name of approval user UserForApprovalLogin=Login of approval user DescCP=Description SendRequestCP=Create leave request @@ -112,7 +112,7 @@ NoticePeriod=Notice period HolidaysToValidate=Validate leave requests HolidaysToValidateBody=Below is a leave request to validate HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. -HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysToValidateAlertSolde=The user who made this leave request does have enough available days. HolidaysValidated=Validated leave requests HolidaysValidatedBody=Your leave request for %s to %s has been validated. HolidaysRefused=Request denied diff --git a/htdocs/langs/en_US/hrm.lang b/htdocs/langs/en_US/hrm.lang index 3889c73dbbb..12bb1592cbc 100644 --- a/htdocs/langs/en_US/hrm.lang +++ b/htdocs/langs/en_US/hrm.lang @@ -5,7 +5,7 @@ Establishments=Establishments Establishment=Establishment NewEstablishment=New establishment DeleteEstablishment=Delete establishment -ConfirmDeleteEstablishment=Are-you sure to delete this establishment? +ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment? OpenEtablishment=Open establishment CloseEtablishment=Close establishment # Dictionary diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang index 00d4be864ff..629ac022331 100644 --- a/htdocs/langs/en_US/install.lang +++ b/htdocs/langs/en_US/install.lang @@ -2,37 +2,37 @@ InstallEasy=Just follow the instructions step by step. MiscellaneousChecks=Prerequisites check ConfFileExists=Configuration file %s exists. -ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file %s does not exist and could not be created ! +ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file %s does not exist and could not be created! ConfFileCouldBeCreated=Configuration file %s could be created. -ConfFileIsNotWritable=Configuration file %s is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS). +ConfFileIsNotWritable=Configuration file %s is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS). ConfFileIsWritable=Configuration file %s is writable. ConfFileMustBeAFileNotADir=Configuration file %s must be a file, not a directory. -ConfFileReload=Reload all information from configuration file. +ConfFileReload=Reloading parameters from configuration file. PHPSupportSessions=This PHP supports sessions. PHPSupportPOSTGETOk=This PHP supports variables POST and GET. -PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter variables_order in php.ini. -PHPSupportGD=This PHP support GD graphical functions. -PHPSupportCurl=This PHP support Curl. -PHPSupportUTF8=This PHP support UTF8 functions. +PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter variables_order in php.ini. +PHPSupportGD=This PHP supports GD graphical functions. +PHPSupportCurl=This PHP supports Curl. +PHPSupportUTF8=This PHP supports UTF8 functions. PHPMemoryOK=Your PHP max session memory is set to %s. This should be enough. -PHPMemoryTooLow=Your PHP max session memory is set to %s bytes. This should be too low. Change your php.ini to set memory_limit parameter to at least %s bytes. -Recheck=Click here for a more significative test -ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup. -ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available. +PHPMemoryTooLow=Your PHP max session memory is set to %s bytes. This is too low. Change your php.ini to set memory_limit parameter to at least %s bytes. +Recheck=Click here for a more detailed test +ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory. +ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available. ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl. -ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr. +ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr. ErrorDirDoesNotExists=Directory %s does not exist. -ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters. +ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters. ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'. ErrorFailedToCreateDatabase=Failed to create database '%s'. ErrorFailedToConnectToDatabase=Failed to connect to database '%s'. ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required. ErrorPHPVersionTooLow=PHP version too old. Version %s is required. -ErrorConnectedButDatabaseNotFound=Connection to server successfull but database '%s' not found. +ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found. ErrorDatabaseAlreadyExists=Database '%s' already exists. -IfDatabaseNotExistsGoBackAndUncheckCreate=If database does not exists, go back and check option "Create database". +IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database". IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option. -WarningBrowserTooOld=Too old version of browser. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommanded. +WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended. PHPVersion=PHP Version License=Using license ConfigurationFile=Configuration file @@ -45,22 +45,22 @@ DolibarrDatabase=Dolibarr Database DatabaseType=Database type DriverType=Driver type Server=Server -ServerAddressDescription=Name or ip address for database server, usually 'localhost' when database server is hosted on same server than web server +ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server. ServerPortDescription=Database server port. Keep empty if unknown. DatabaseServer=Database server DatabaseName=Database name -DatabasePrefix=Database prefix table -AdminLogin=Login for Dolibarr database owner. -PasswordAgain=Retype password a second time +DatabasePrefix=Database table prefix +AdminLogin=User account for the Dolibarr database owner. +PasswordAgain=Retype password confirmation AdminPassword=Password for Dolibarr database owner. CreateDatabase=Create database -CreateUser=Create owner or grant him permission on database +CreateUser=Create user account or grant user account permission on the Dolibarr database DatabaseSuperUserAccess=Database server - Superuser access -CheckToCreateDatabase=Check box if database does not exist and must be created.
In this case, you must fill the login/password for superuser account at the bottom of this page. -CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.
In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists. -DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists. -KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this) -SaveConfigurationFile=Save values +CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.
In this case, you must fill in the user name and password for the superuser account at the bottom of this page. +CheckToCreateUser=Check the box if:
the database user account does not yet exist and so must be created, or
if the user account exists but the database does not exist and permissions must be granted.
In this case, you must enter the user account and password and also the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist. +DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist. +KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended) +SaveConfigurationFile=Saving parameters to ServerConnection=Server connection DatabaseCreation=Database creation CreateDatabaseObjects=Database objects creation @@ -71,9 +71,9 @@ CreateOtherKeysForTable=Create foreign keys and indexes for table %s OtherKeysCreation=Foreign keys and indexes creation FunctionsCreation=Functions creation AdminAccountCreation=Administrator login creation -PleaseTypePassword=Please type a password, empty passwords are not allowed ! -PleaseTypeALogin=Please type a login ! -PasswordsMismatch=Passwords differs, please try again ! +PleaseTypePassword=Please type a password, empty passwords are not allowed! +PleaseTypeALogin=Please type a login! +PasswordsMismatch=Passwords differs, please try again! SetupEnd=End of setup SystemIsInstalled=This installation is complete. SystemIsUpgraded=Dolibarr has been upgraded successfully. @@ -81,65 +81,65 @@ YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (app AdminLoginCreatedSuccessfuly=Dolibarr administrator login '%s' created successfully. GoToDolibarr=Go to Dolibarr GoToSetupArea=Go to Dolibarr (setup area) -MigrationNotFinished=Version of your database is not completely up to date, so you'll have to run the upgrade process again. +MigrationNotFinished=The database version is not completely up to date: run the upgrade process again. GoToUpgradePage=Go to upgrade page again WithNoSlashAtTheEnd=Without the slash "/" at the end -DirectoryRecommendation=It is recommanded to use a directory outside of your directory of your web pages. +DirectoryRecommendation=It is recommended to use a directory outside of the web pages. LoginAlreadyExists=Already exists DolibarrAdminLogin=Dolibarr admin login -AdminLoginAlreadyExists=Dolibarr administrator account '%s' already exists. Go back, if you want to create another one. +AdminLoginAlreadyExists=Dolibarr administrator account '%s' already exists. Go back if you want to create another one. FailedToCreateAdminLogin=Failed to create Dolibarr administrator account. -WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called install.lock into Dolibarr document directory, in order to avoid malicious use of it. -FunctionNotAvailableInThisPHP=Not available on this PHP +WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called install.lock into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again. +FunctionNotAvailableInThisPHP=Not available in this PHP ChoosedMigrateScript=Choose migration script DataMigration=Database migration (data) DatabaseMigration=Database migration (structure + some data) ProcessMigrateScript=Script processing ChooseYourSetupMode=Choose your setup mode and click "Start"... FreshInstall=Fresh install -FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install, but if you want to upgrade your version, choose "Upgrade" mode. +FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode. Upgrade=Upgrade UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data. Start=Start InstallNotAllowed=Setup not allowed by conf.php permissions YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process. -CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload page. +CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page. AlreadyDone=Already migrated DatabaseVersion=Database version ServerVersion=Database server version YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it. DBSortingCollation=Character sorting order -YouAskDatabaseCreationSoDolibarrNeedToConnect=You ask to create database %s, but for this, Dolibarr need to connect to server %s with super user %s permissions. -YouAskLoginCreationSoDolibarrNeedToConnect=You ask to create database login %s, but for this, Dolibarr need to connect to server %s with super user %s permissions. -BecauseConnectionFailedParametersMayBeWrong=As connection failed, host or super user parameters must be wrong. +YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database %s, but for this, Dolibarr needs to connect to server %s with super user %s permissions. +YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user %s, but for this, Dolibarr needs to connect to server %s with super user %s permissions. +BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong. OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue. FieldRenamed=Field renamed -IfLoginDoesNotExistsCheckCreateUser=If login does not exists yet, you must check option "Create user" -ErrorConnection=Server "%s", database name "%s", login "%s", or database password may be wrong or PHP client version may be too old compared to database version. +IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user" +ErrorConnection=Server "%s", database name "%s", login "%s", or database password may be wrong or the PHP client version may be too old compared to the database version. InstallChoiceRecommanded=Recommended choice to install version %s from your current version %s InstallChoiceSuggested=Install choice suggested by installer. -MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions, so install wizard will come back to suggest next migration once this one will be finished. -CheckThatDatabasenameIsCorrect=Check that database name "%s" is correct. +MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete. +CheckThatDatabasenameIsCorrect=Check that the database name "%s" is correct. IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database". OpenBaseDir=PHP openbasedir parameter -YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide login/password of superuser (bottom of form). -YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide login/password of superuser (bottom of form). -NextStepMightLastALongTime=Current step may last several minutes. Please wait until the next screen is shown completely before continuing. +YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form). +YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form). +NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing. MigrationCustomerOrderShipping=Migrate shipping for customer orders storage MigrationShippingDelivery=Upgrade storage of shipping MigrationShippingDelivery2=Upgrade storage of shipping 2 MigrationFinished=Migration finished -LastStepDesc=Last step: Define here login and password you plan to use to connect to software. Do not loose this as it is the account to administer all others. +LastStepDesc=Last step: Define here the login and password you wish to use to connect to Dolibarr. Do not lose this as it is the master account to administer all other/additional user accounts. ActivateModule=Activate module %s ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode) -WarningUpgrade=Warning:\nDid your run a database backup first?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... -ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) -KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do. -KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do. -KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do. -KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do. -UpgradeExternalModule=Run dedicated upgrade process of external modules +WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s) +KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing. +KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing. +KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing. +KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing. +UpgradeExternalModule=Run dedicated upgrade process of external module SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete NothingToDo=Nothing to do @@ -151,7 +151,7 @@ MigrationSupplierOrder=Data migration for vendor's orders MigrationProposal=Data migration for commercial proposals MigrationInvoice=Data migration for customer's invoices MigrationContract=Data migration for contracts -MigrationSuccessfullUpdate=Upgrade successfull +MigrationSuccessfullUpdate=Upgrade successful MigrationUpdateFailed=Failed upgrade process MigrationRelationshipTables=Data migration for relationship tables (%s) MigrationPaymentsUpdate=Payment data correction @@ -163,9 +163,9 @@ MigrationContractsUpdate=Contract data correction MigrationContractsNumberToUpdate=%s contract(s) to update MigrationContractsLineCreation=Create contract line for contract ref %s MigrationContractsNothingToUpdate=No more things to do -MigrationContractsFieldDontExist=Field fk_facture does not exists anymore. Nothing to do. +MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do. MigrationContractsEmptyDatesUpdate=Contract empty date correction -MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully +MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct MigrationContractsInvalidDatesUpdate=Bad value date contract correction @@ -187,24 +187,24 @@ MigrationDeliveryDetail=Delivery update MigrationStockDetail=Update stock value of products MigrationMenusDetail=Update dynamic menus tables MigrationDeliveryAddress=Update delivery address in shipments -MigrationProjectTaskActors=Data migration for llx_projet_task_actors table +MigrationProjectTaskActors=Data migration for table llx_projet_task_actors MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact MigrationProjectTaskTime=Update time spent in seconds MigrationActioncommElement=Update data on actions MigrationPaymentMode=Data migration for payment mode MigrationCategorieAssociation=Migration of categories -MigrationEvents=Migration of events to add event owner into assignement table -MigrationEventsContact=Migration of events to add event contact into assignement table +MigrationEvents=Migration of events to add event owner into assignment table +MigrationEventsContact=Migration of events to add event contact into assignment table MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationUserRightsEntity=Update entity field value of llx_user_rights MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights MigrationReloadModule=Reload module %s MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm -ShowNotAvailableOptions=Show not available options -HideNotAvailableOptions=Hide not available options -ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. -YouTryInstallDisabledByDirLock=The application try to sefl upgrade, but install/upgrade pages have been disabled for security reason (directory renamed with .lock suffix).
-YouTryInstallDisabledByFileLock=The application try to sefl upgrade, but install/upgrade pages pages have been disabled for security reason (by lock file install.lock into dolibarr documents directory).
+ShowNotAvailableOptions=Show unavailable options +HideNotAvailableOptions=Hide unavailable options +ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can click here, but the application or some features may not work correctly until the errors are resolved. +YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).
+YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file install.lock in the dolibarr documents directory).
ClickHereToGoToApp=Click here to go to your application -ClickOnLinkOrRemoveManualy=Click on following link and if you always reach this page, you must remove the file install.lock into documents directory manually \ No newline at end of file +ClickOnLinkOrRemoveManualy=Click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory. \ No newline at end of file diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang index bab16304d83..21dc5ec4db5 100644 --- a/htdocs/langs/en_US/mails.lang +++ b/htdocs/langs/en_US/mails.lang @@ -33,7 +33,7 @@ ValidMailing=Valid emailing MailingStatusDraft=Draft MailingStatusValidated=Validated MailingStatusSent=Sent -MailingStatusSentPartialy=Sent partialy +MailingStatusSentPartialy=Sent partially MailingStatusSentCompletely=Sent completely MailingStatusError=Error MailingStatusNotSent=Not sent @@ -45,8 +45,8 @@ MailingStatusReadAndUnsubscribe=Read and unsubscribe ErrorMailRecipientIsEmpty=Email recipient is empty WarningNoEMailsAdded=No new Email to add to recipient's list. ConfirmValidMailing=Are you sure you want to validate this emailing? -ConfirmResetMailing=Warning, by reinitializing emailing %s, you allow to make a mass sending of this email another time. Are you sure you this is what you want to do? -ConfirmDeleteMailing=Are you sure you want to delete this emailling? +ConfirmResetMailing=Warning, by reinitializing emailing %s, you will allow resending this email in a mass mailing. Are you sure you this is what you want to do? +ConfirmDeleteMailing=Are you sure you want to delete this emailing? NbOfUniqueEMails=Nb of unique emails NbOfEMails=Nb of EMails TotalNbOfDistinctRecipients=Number of distinct recipients @@ -66,12 +66,12 @@ DateLastSend=Date of latest sending DateSending=Date sending SentTo=Sent to %s MailingStatusRead=Read -YourMailUnsubcribeOK=The email %s is correctly unsubcribe from mailing list -ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature +YourMailUnsubcribeOK=The email %s is correctly unsubscribe from mailing list +ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubscribe" feature EMailSentToNRecipients=EMail sent to %s recipients. EMailSentForNElements=EMail sent for %s elements. XTargetsAdded=%s recipients added into target list -OnlyPDFattachmentSupported=If the PDF documents were already generated for the objects to send, they will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version). +OnlyPDFattachmentSupported=If the PDF documents were already generated for the objects to send, they will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachments in mass sending in this version). AllRecipientSelected=The recipients of the %s record selected (if their email is known). GroupEmails=Group emails OneEmailPerRecipient=One email per recipient (by default, one email per record selected) @@ -139,7 +139,7 @@ UseFormatFileEmailToTarget=Imported file must have format email;name;fir UseFormatInputEmailToTarget=Enter a string with format email;name;firstname;other MailAdvTargetRecipients=Recipients (advanced selection) AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target -AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like jean, joe, jim, you can input j%%, you can also use ; as separator for value, and use ! for except this value. For exemple jean;joe;jim%%;!jimo;!jima% will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima +AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like jean, joe, jim, you can input j%%, you can also use ; as separator for value, and use ! for except this value. For example jean;joe;jim%%;!jimo;!jima% will target all jean, joe, start with jim but not jimo and not everything that starts with jima AdvTgtSearchIntHelp=Use interval to select int or float value AdvTgtMinVal=Minimum value AdvTgtMaxVal=Maximum value @@ -153,7 +153,7 @@ AddAll=Add all RemoveAll=Remove all ItemsCount=Item(s) AdvTgtNameTemplate=Filter name -AdvTgtAddContact=Add emails according to criterias +AdvTgtAddContact=Add emails according to criteria AdvTgtLoadFilter=Load filter AdvTgtDeleteFilter=Delete filter AdvTgtSaveFilter=Save filter @@ -166,4 +166,4 @@ InGoingEmailSetup=Incoming email setup OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing) DefaultOutgoingEmailSetup=Default outgoing email setup Information=Information -ContactsWithThirdpartyFilter=Contacts avec filtre client +ContactsWithThirdpartyFilter=Contacts with third party filter diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index c9320a9ebb1..51514b98160 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -468,7 +468,7 @@ and=and or=or Other=Other Others=Others -OtherInformations=Other informations +OtherInformations=Other information Quantity=Quantity Qty=Qty ChangedBy=Changed by @@ -716,7 +716,7 @@ Merge=Merge DocumentModelStandardPDF=Standard PDF template PrintContentArea=Show page to print main content area MenuManager=Menu manager -WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only login %s is allowed to use application at the moment. +WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only login %s is allowed to use the application at the moment. CoreErrorTitle=System error CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information. CreditCard=Credit card @@ -724,7 +724,7 @@ ValidatePayment=Validate payment CreditOrDebitCard=Credit or debit card FieldsWithAreMandatory=Fields with %s are mandatory FieldsWithIsForPublic=Fields with %s are shown on public list of members. If you don't want this, check off the "public" box. -AccordingToGeoIPDatabase=(according to GeoIP convertion) +AccordingToGeoIPDatabase=(according to GeoIP conversion) Line=Line NotSupported=Not supported RequiredField=Required field @@ -818,12 +818,12 @@ Sincerely=Sincerely DeleteLine=Delete line ConfirmDeleteLine=Are you sure you want to delete this line? NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record -TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record. +TooManyRecordForMassAction=Too many records selected for mass action. The action is restricted to a list of %s records. NoRecordSelected=No record selected MassFilesArea=Area for files built by mass actions ShowTempMassFilesArea=Show area of files built by mass actions -ConfirmMassDeletion=Bulk delete confirmation -ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ? +ConfirmMassDeletion=Mass delete confirmation +ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record? RelatedObjects=Related Objects ClassifyBilled=Classify billed ClassifyUnbilled=Classify unbilled @@ -841,7 +841,7 @@ Calendar=Calendar GroupBy=Group by... ViewFlatList=View flat list RemoveString=Remove string '%s' -SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to https://transifex.com/projects/p/dolibarr/. +SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at https://transifex.com/projects/p/dolibarr/ to add your improvements. DirectDownloadLink=Direct download link (public/external) DirectDownloadInternalLink=Direct download link (need to be logged and need permissions) Download=Download @@ -861,11 +861,11 @@ HR=HR HRAndBank=HR and Bank AutomaticallyCalculated=Automatically calculated TitleSetToDraft=Go back to draft -ConfirmSetToDraft=Are you sure you want to go back to Draft status ? +ConfirmSetToDraft=Are you sure you want to go back to Draft status? ImportId=Import id Events=Events EMailTemplates=Emails templates -FileNotShared=File not shared to exernal public +FileNotShared=File not shared to external public Project=Project Projects=Projects Rights=Permissions @@ -945,6 +945,6 @@ LocalAndRemote=Local and Remote KeyboardShortcut=Keyboard shortcut AssignedTo=Assigned to Deletedraft=Delete draft -ConfirmMassDraftDeletion=Draft Bulk delete confirmation +ConfirmMassDraftDeletion=Draft mass delete confirmation FileSharedViaALink=File shared via a link diff --git a/htdocs/langs/en_US/margins.lang b/htdocs/langs/en_US/margins.lang index b9d52dcfdc6..167e316703c 100644 --- a/htdocs/langs/en_US/margins.lang +++ b/htdocs/langs/en_US/margins.lang @@ -41,4 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value markRateShouldBeLesserThan100=Mark rate should be lower than 100 ShowMarginInfos=Show margin infos CheckMargins=Margins detail -MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative). +MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative). diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang index 98e42b45e96..9eac3a0c542 100644 --- a/htdocs/langs/en_US/members.lang +++ b/htdocs/langs/en_US/members.lang @@ -88,7 +88,7 @@ ConfirmDeleteSubscription=Are you sure you want to delete this subscription? Filehtpasswd=htpasswd file ValidateMember=Validate a member ConfirmValidateMember=Are you sure you want to validate this member? -FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database. +FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database. PublicMemberList=Public member list BlankSubscriptionForm=Public self-subscription form BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided. diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang index 30db5989587..3601872414b 100644 --- a/htdocs/langs/en_US/modulebuilder.lang +++ b/htdocs/langs/en_US/modulebuilder.lang @@ -1,5 +1,5 @@ # Dolibarr language file - Source file is en_US - loan -ModuleBuilderDesc=This tools must be used by experienced users or developers. It gives you utilities to build or edit your own module (Documentation for alternative manual development is here). +ModuleBuilderDesc=This tool must be used by only by experienced users or developers. It gives you utilities to build or edit your own module.
Documentation for alternative manual development is here. EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...) EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated. ModuleBuilderDesc2=Path where modules are generated/edited (first alternative directory defined into %s): %s @@ -13,7 +13,7 @@ ModuleInitialized=Module initialized FilesForObjectInitialized=Files for new object '%s' initialized FilesForObjectUpdated=Files for object '%s' updated (.sql files and .class.php file) ModuleBuilderDescdescription=Enter here all general information that describe your module. -ModuleBuilderDescspecifications=You can enter here a long text to describe the specifications of your module that is not already structured into other tabs. So you have within easy reach all the rules to develop. Also this text content will be included into the generated documentation (see last tab). You can use Markdown format, but it is recommanded to use Asciidoc format (Comparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown) +ModuleBuilderDescspecifications=You can enter here a detailed description of the specifications of your module that is not already structured into other tabs. So you have within easy reach all the rules to develop. Also this text content will be included into the generated documentation (see last tab). You can use Markdown format, but it is recommended to use Asciidoc format (comparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown). ModuleBuilderDescobjects=Define here the objects you want to manage with your module. A CRUD DAO class, SQL files, page to list record of objects, to create/edit/view a record and an API will be generated. ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module. ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module. @@ -21,12 +21,12 @@ ModuleBuilderDesctriggers=This is the view of triggers provided by your module. ModuleBuilderDeschooks=This tab is dedicated to hooks. ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets. ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file. -EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All files of module but also structured data and documentation will be definitly lost ! -EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be definitly lost ! +EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: ALL files of module AND structured data and documentation will be deleted! +EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All files related to object will be deleted! DangerZone=Danger zone BuildPackage=Build package/documentation BuildDocumentation=Build documentation -ModuleIsNotActive=This module was not activated yet. Go into %s to make it live or click here: +ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here: ModuleIsLive=This module has been activated. Any change on it may break a current active feature. DescriptionLong=Long description EditorName=Name of editor @@ -47,7 +47,7 @@ RegenerateClassAndSql=Erase and regenerate class and sql files RegenerateMissingFiles=Generate missing files SpecificationFile=File with business rules LanguageFile=File for language -ConfirmDeleteProperty=Are you sure you want to delete the property %s ? This will change code in PHP class but also remove column from table definition of object. +ConfirmDeleteProperty=Are you sure you want to delete the property %s? This will change code in PHP class but also remove column from table definition of object. NotNull=Not NULL NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0). SearchAll=Used for 'search all' @@ -66,7 +66,7 @@ PageForLib=File for PHP libraries SqlFileExtraFields=Sql file for complementary attributes SqlFileKey=Sql file for keys AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case -UseAsciiDocFormat=You can use Markdown format, but it is recommanded to use Asciidoc format (Comparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown) +UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown) IsAMeasure=Is a measure DirScanned=Directory scanned NoTrigger=No trigger @@ -77,8 +77,8 @@ ListOfPermissionsDefined=List of defined permissions SeeExamples=See examples here EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION) VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only. Using a negative value means field is not shown by default on list but can be selected for viewing) -IsAMeasureDesc=Can the value of field be cumulated to get a total into list ? (Examples: 1 or 0) -SearchAllDesc=Is the field used to make a search from the quick search tool ? (Examples: 1 or 0) +IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0) +SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0) SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax. LanguageDefDesc=Enter in this files, all the key and the translation for each language file. MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s) @@ -88,7 +88,7 @@ TriggerDefDesc=Define in the trigger file the code you want to execute for each SeeIDsInUse=See IDs in use in your installation SeeReservedIDsRangeHere=See range of reserved IDs ToolkitForDevelopers=Toolkit for Dolibarr developers -TryToUseTheModuleBuilder=If you have knowledge in SQL and PHP, you can try to use the native module builder wizard. Just enable the module and use the wizard by clicking the on the top right menu. Warning: This is a developer feature, bad use may breaks your application. +TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the native module builder wizard.
Enable the module (Setup->Other Setup->MAIN_FEATURES_LEVEL = 2) and use the wizard by clicking the on the top right menu.
Warning: This is an advanced developer feature, do not experiment on your production site! SeeTopRightMenu=See on the top right menu AddLanguageFile=Add language file YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages") diff --git a/htdocs/langs/en_US/multicurrency.lang b/htdocs/langs/en_US/multicurrency.lang index 0da2ee58b60..048e6721310 100644 --- a/htdocs/langs/en_US/multicurrency.lang +++ b/htdocs/langs/en_US/multicurrency.lang @@ -3,18 +3,18 @@ MultiCurrency=Multi currency ErrorAddRateFail=Error in added rate ErrorAddCurrencyFail=Error in added currency ErrorDeleteCurrencyFail=Error delete fail -multicurrency_syncronize_error=Synchronisation error: %s -MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use date of document to find currency rate, instead of using latest known rate -multicurrency_useOriginTx=When an object is created from another, keep the original rate of source object (otherwise use the latest known rate) +multicurrency_syncronize_error=Synchronization error: %s +MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate +multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate) CurrencyLayerAccount=CurrencyLayer API -CurrencyLayerAccount_help_to_synchronize=You sould create an account on their website to use this functionnality
Get your API key
If you use a free account you can't change the currency source (USD by default)
But if your main currency isn't USD you can use the alternate currency source to force you main currency

You are limited at 1000 synchronizations per month +CurrencyLayerAccount_help_to_synchronize=You must create an account on their website to use this functionality.
Get your API key.
If you use a free account you can't change the currency source (USD by default).
If your main currency is not USD you can use the alternate currency source to force your main currency.

You are limited to 1000 synchronizations per month. multicurrency_appId=API key multicurrency_appCurrencySource=Currency source multicurrency_alternateCurrencySource=Alternate currency source CurrenciesUsed=Currencies used -CurrenciesUsed_help_to_add=Add the differents currencies and rates you need to use on you proposals, orders, etc. +CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your proposals, orders etc. rate=rate MulticurrencyReceived=Received, original currency -MulticurrencyRemainderToTake=Remaining amout, original currency +MulticurrencyRemainderToTake=Remaining amount, original currency MulticurrencyPaymentAmount=Payment amount, original currency AmountToOthercurrency=Amount To (in currency of receiving account) \ No newline at end of file diff --git a/htdocs/langs/en_US/opensurvey.lang b/htdocs/langs/en_US/opensurvey.lang index 41f91cf8bef..0dff05cbfc0 100644 --- a/htdocs/langs/en_US/opensurvey.lang +++ b/htdocs/langs/en_US/opensurvey.lang @@ -11,7 +11,7 @@ PollTitle=Poll title ToReceiveEMailForEachVote=Receive an email for each vote TypeDate=Type date TypeClassic=Type standard -OpenSurveyStep2=Select your dates amoung the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it +OpenSurveyStep2=Select your dates among the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it RemoveAllDays=Remove all days CopyHoursOfFirstDay=Copy hours of first day RemoveAllHours=Remove all hours diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang index 06191d9f7b7..ac4ff87b8e1 100644 --- a/htdocs/langs/en_US/orders.lang +++ b/htdocs/langs/en_US/orders.lang @@ -88,7 +88,7 @@ NumberOfOrdersByMonth=Number of orders by month AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) ListOfOrders=List of orders CloseOrder=Close order -ConfirmCloseOrder=Are you sure you want to set this order to deliverd? Once an order is delivered, it can be set to billed. +ConfirmCloseOrder=Are you sure you want to set this order to delivered? Once an order is delivered, it can be set to billed. ConfirmDeleteOrder=Are you sure you want to delete this order? ConfirmValidateOrder=Are you sure you want to validate this order under name %s? ConfirmUnvalidateOrder=Are you sure you want to restore order %s to draft status? @@ -116,7 +116,7 @@ DispatchSupplierOrder=Receiving supplier order %s FirstApprovalAlreadyDone=First approval already done SecondApprovalAlreadyDone=Second approval already done SupplierOrderReceivedInDolibarr=Purchase Order %s received %s -SupplierOrderSubmitedInDolibarr=Purchase Order %s submited +SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted SupplierOrderClassifiedBilled=Purchase Order %s set billed OtherOrders=Other orders ##### Types de contacts ##### diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang index 8ef8cc30090..c5535cd8eb0 100644 --- a/htdocs/langs/en_US/other.lang +++ b/htdocs/langs/en_US/other.lang @@ -23,7 +23,7 @@ MessageForm=Message on online payment form MessageOK=Message on validated payment return page MessageKO=Message on canceled payment return page ContentOfDirectoryIsNotEmpty=Content of this directory is not empty. -DeleteAlsoContentRecursively=Check to delete all content recursiveley +DeleteAlsoContentRecursively=Check to delete all content recursively YearOfInvoice=Year of invoice date PreviousYearOfInvoice=Previous year of invoice date @@ -41,8 +41,8 @@ Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused Notify_PROPAL_VALIDATE=Customer proposal validated -Notify_PROPAL_CLOSE_SIGNED=Customer propal closed signed -Notify_PROPAL_CLOSE_REFUSED=Customer propal closed refused +Notify_PROPAL_CLOSE_SIGNED=Customer proposal closed signed +Notify_PROPAL_CLOSE_REFUSED=Customer proposal closed refused Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail Notify_WITHDRAW_TRANSMIT=Transmission withdrawal Notify_WITHDRAW_CREDIT=Credit withdrawal @@ -185,7 +185,7 @@ NumberOfUnitsCustomerInvoices=Number of units on customer invoices NumberOfUnitsSupplierProposals=Number of units on supplier proposals NumberOfUnitsSupplierOrders=Number of units on supplier orders NumberOfUnitsSupplierInvoices=Number of units on supplier invoices -EMailTextInterventionAddedContact=A newintervention %s has been assigned to you. +EMailTextInterventionAddedContact=A new intervention %s has been assigned to you. EMailTextInterventionValidated=The intervention %s has been validated. EMailTextInvoiceValidated=The invoice %s has been validated. EMailTextProposalValidated=The proposal %s has been validated. @@ -204,7 +204,7 @@ NewLength=New width NewHeight=New height NewSizeAfterCropping=New size after cropping DefineNewAreaToPick=Define new area on image to pick (left click on image then drag until you reach the opposite corner) -CurrentInformationOnImage=This tool was designed to help you to resize or crop an image. This is informations on current edited image +CurrentInformationOnImage=This tool was designed to help you to resize or crop an image. This is the information on the current edited image ImageEditor=Image editor YouReceiveMailBecauseOfNotification=You receive this message because your email has been added to list of targets to be informed of particular events into %s software of %s. YouReceiveMailBecauseOfNotification2=This event is the following: diff --git a/htdocs/langs/en_US/paybox.lang b/htdocs/langs/en_US/paybox.lang index 522243ab899..c7e7bd38bdc 100644 --- a/htdocs/langs/en_US/paybox.lang +++ b/htdocs/langs/en_US/paybox.lang @@ -21,9 +21,9 @@ ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription YouCanAddTagOnUrl=You can also add url parameter &tag=value to any of those URL (required only for free payment) to add your own payment comment tag. -SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url %s to have payment created automatically when validated by paybox. +SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url %s to have payment created automatically when validated by Paybox. YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you. -YourPaymentHasNotBeenRecorded=You payment has NOT been recorded and transaction has been canceled. Thank you. +YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you. AccountParameter=Account parameters UsageParameter=Usage parameters InformationToFindParameters=Help to find your %s account information diff --git a/htdocs/langs/en_US/paypal.lang b/htdocs/langs/en_US/paypal.lang index 547b188b4a5..bc5e828e903 100644 --- a/htdocs/langs/en_US/paypal.lang +++ b/htdocs/langs/en_US/paypal.lang @@ -1,19 +1,19 @@ # Dolibarr language file - Source file is en_US - paypal PaypalSetup=PayPal module setup -PaypalDesc=This module offer pages to allow payment on PayPal by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...) -PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal) -PaypalDoPayment=Pay with Paypal +PaypalDesc=This module allows payment on PayPal by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...) +PaypalOrCBDoPayment=Pay with PayPal (Credit Card or PayPal) +PaypalDoPayment=Pay with PayPal PAYPAL_API_SANDBOX=Mode test/sandbox PAYPAL_API_USER=API username PAYPAL_API_PASSWORD=API password PAYPAL_API_SIGNATURE=API signature PAYPAL_SSLVERSION=Curl SSL Version -PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer payment "integral" (Credit card+Paypal) or "Paypal" only +PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer payment "integral" (Credit card+PayPal) or "PayPal" only PaypalModeIntegral=Integral PaypalModeOnlyPaypal=PayPal only -ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page +ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page ThisIsTransactionId=This is id of transaction: %s -PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail +PAYPAL_ADD_PAYMENT_URL=Add the url of PayPal payment when you send a document by mail YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode NewOnlinePaymentReceived=New online payment received NewOnlinePaymentFailed=New online payment tried but failed @@ -28,7 +28,7 @@ ShortErrorMessage=Short Error Message ErrorCode=Error Code ErrorSeverityCode=Error Severity Code OnlinePaymentSystem=Online payment system -PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode) -PaypalImportPayment=Import Paypal payments +PaypalLiveEnabled=PayPal live enabled (otherwise test/sandbox mode) +PaypalImportPayment=Import PayPal payments PostActionAfterPayment=Post actions after payments ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary. \ No newline at end of file diff --git a/htdocs/langs/en_US/printing.lang b/htdocs/langs/en_US/printing.lang index e8349453247..d2399823e37 100644 --- a/htdocs/langs/en_US/printing.lang +++ b/htdocs/langs/en_US/printing.lang @@ -2,7 +2,7 @@ Module64000Name=Direct Printing Module64000Desc=Enable Direct Printing System PrintingSetup=Setup of Direct Printing System -PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +PrintingDesc=This module adds a Print button to various modules to allow documents to be printed directly to a printer without needing to open the document in another application. MenuDirectPrinting=Direct Printing jobs DirectPrint=Direct print PrintingDriverDesc=Configuration variables for printing driver. @@ -19,7 +19,7 @@ UserConf=Setup per user PRINTGCP_INFO=Google OAuth API setup PRINTGCP_AUTHLINK=Authentication PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token -PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintGCPDesc=This driver allows sending documents directly to a printer using Google Cloud Print. GCP_Name=Name GCP_displayName=Display Name GCP_Id=Printer Id @@ -27,7 +27,7 @@ GCP_OwnerName=Owner Name GCP_State=Printer State GCP_connectionStatus=Online State GCP_Type=Printer Type -PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintIPPDesc=This driver allows sending of documents directly to a printer. It requires a Linux system with CUPS installed. PRINTIPP_HOST=Print server PRINTIPP_PORT=Port PRINTIPP_USER=Login diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang index 21c2e1dc62c..e5da8738d96 100644 --- a/htdocs/langs/en_US/products.lang +++ b/htdocs/langs/en_US/products.lang @@ -17,12 +17,12 @@ Reference=Reference NewProduct=New product NewService=New service ProductVatMassChange=Mass VAT change -ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database. +ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from one value to another. Warning, this change is global/done on all database. MassBarcodeInit=Mass barcode init MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete. ProductAccountancyBuyCode=Accounting code (purchase) ProductAccountancySellCode=Accounting code (sale) -ProductAccountancySellIntraCode=Accounting code (sale intra-community) +ProductAccountancySellIntraCode=Accounting code (sale intra-Community) ProductAccountancySellExportCode=Accounting code (sale export) ProductOrService=Product or Service ProductsAndServices=Products and Services @@ -97,7 +97,7 @@ NoteNotVisibleOnBill=Note (not visible on invoices, proposals...) ServiceLimitedDuration=If product is a service with limited duration: MultiPricesAbility=Several segment of prices per product/service (each customer is in one segment) MultiPricesNumPrices=Number of prices -AssociatedProductsAbility=Activate the feature to manage virtual products +AssociatedProductsAbility=Activate virtual products (kits) AssociatedProducts=Virtual product AssociatedProductsNumber=Number of products composing this virtual product ParentProductsNumber=Number of parent packaging product @@ -134,7 +134,7 @@ PredefinedServicesToSell=Predefined services to sell PredefinedProductsAndServicesToSell=Predefined products/services to sell PredefinedProductsToPurchase=Predefined product to purchase PredefinedServicesToPurchase=Predefined services to purchase -PredefinedProductsAndServicesToPurchase=Predefined products/services to puchase +PredefinedProductsAndServicesToPurchase=Predefined products/services to purchase NotPredefinedProducts=Not predefined products/services GenerateThumb=Generate thumb ServiceNb=Service #%s @@ -145,7 +145,7 @@ Finished=Manufactured product RowMaterial=Raw Material CloneProduct=Clone product or service ConfirmCloneProduct=Are you sure you want to clone product or service %s? -CloneContentProduct=Clone all main informations of product/service +CloneContentProduct=Clone all main information of product/service ClonePricesProduct=Clone prices CloneCompositionProduct=Clone packaged product/service CloneCombinationsProduct=Clone product variants @@ -202,7 +202,7 @@ PriceByQuantity=Different prices by quantity DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Quantity range MultipriceRules=Price segment rules -UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment +UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment PercentVariationOver=%% variation over %s PercentDiscountOver=%% discount over %s KeepEmptyForAutoCalculation=Keep empty to have this calculated automatically from weight or volume of products @@ -233,7 +233,7 @@ BarCodeDataForThirdparty=Barcode information of third party %s : ResetBarcodeForAllRecords=Define barcode value for all record (this will also reset barcode value already defined with new values) PriceByCustomer=Different prices for each customer PriceCatalogue=A single sell price per product/service -PricingRule=Rules for sell prices +PricingRule=Rules for selling prices AddCustomerPrice=Add price by customer ForceUpdateChildPriceSoc=Set same price on customer subsidiaries PriceByCustomerLog=Log of previous customer prices @@ -254,7 +254,7 @@ ComposedProduct=Sub-product MinSupplierPrice=Minimum buying price MinCustomerPrice=Minimum selling price DynamicPriceConfiguration=Dynamic price configuration -DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able to use and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value. +DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able to use and if the variable need an automatic update, the external URL to use to ask Dolibarr to update the value automatically. AddVariable=Add Variable AddUpdater=Add Updater GlobalVariables=Global variables diff --git a/htdocs/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang index 5a7169ac925..2d2f1bb2ff0 100644 --- a/htdocs/langs/en_US/propal.lang +++ b/htdocs/langs/en_US/propal.lang @@ -53,7 +53,7 @@ ErrorPropalNotFound=Propal %s not found AddToDraftProposals=Add to draft proposal NoDraftProposals=No draft proposals CopyPropalFrom=Create commercial proposal by copying existing proposal -CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services +CreateEmptyPropal=Create empty commercial proposal or from list of products/services DefaultProposalDurationValidity=Default commercial proposal validity duration (in days) UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address ClonePropal=Clone commercial proposal diff --git a/htdocs/langs/en_US/salaries.lang b/htdocs/langs/en_US/salaries.lang index 432ab894040..1efb877673d 100644 --- a/htdocs/langs/en_US/salaries.lang +++ b/htdocs/langs/en_US/salaries.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - salaries SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties -SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accouting account on user is not defined. +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined. SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments Salary=Salary Salaries=Salaries @@ -15,4 +15,4 @@ THMDescription=This value may be used to calculate cost of time consumed on a pr TJMDescription=This value is currently as information only and is not used for any calculation LastSalaries=Latest %s salary payments AllSalaries=All salary payments -SalariesStatistics=Statistiques salaires \ No newline at end of file +SalariesStatistics=Salary statistics \ No newline at end of file diff --git a/htdocs/langs/en_US/sms.lang b/htdocs/langs/en_US/sms.lang index 05b521aae36..15200341490 100644 --- a/htdocs/langs/en_US/sms.lang +++ b/htdocs/langs/en_US/sms.lang @@ -1,9 +1,9 @@ # Dolibarr language file - Source file is en_US - sms Sms=Sms -SmsSetup=Sms setup -SmsDesc=This page allows you to define globals options on SMS features +SmsSetup=SMS setup +SmsDesc=This page allows you to define global options on SMS features SmsCard=SMS Card -AllSms=All SMS campains +AllSms=All SMS campaigns SmsTargets=Targets SmsRecipients=Targets SmsRecipient=Target @@ -13,20 +13,20 @@ SmsTo=Target SmsTopic=Topic of SMS SmsText=Message SmsMessage=SMS Message -ShowSms=Show Sms -ListOfSms=List SMS campains -NewSms=New SMS campain -EditSms=Edit Sms +ShowSms=Show SMS +ListOfSms=List SMS campaigns +NewSms=New SMS campaign +EditSms=Edit SMS ResetSms=New sending -DeleteSms=Delete Sms campain -DeleteASms=Remove a Sms campain -PreviewSms=Previuw Sms -PrepareSms=Prepare Sms -CreateSms=Create Sms -SmsResult=Result of Sms sending -TestSms=Test Sms -ValidSms=Validate Sms -ApproveSms=Approve Sms +DeleteSms=Delete SMS campaign +DeleteASms=Remove a SMS campaign +PreviewSms=Previuw SMS +PrepareSms=Prepare SMS +CreateSms=Create SMS +SmsResult=Result of SMS sending +TestSms=Test SMS +ValidSms=Validate SMS +ApproveSms=Approve SMS SmsStatusDraft=Draft SmsStatusValidated=Validated SmsStatusApproved=Approved @@ -35,10 +35,10 @@ SmsStatusSentPartialy=Sent partially SmsStatusSentCompletely=Sent completely SmsStatusError=Error SmsStatusNotSent=Not sent -SmsSuccessfulySent=Sms correctly sent (from %s to %s) +SmsSuccessfulySent=SMS correctly sent (from %s to %s) ErrorSmsRecipientIsEmpty=Number of target is empty WarningNoSmsAdded=No new phone number to add to target list -ConfirmValidSms=Do you confirm validation of this campain? +ConfirmValidSms=Do you confirm validation of this campaign? NbOfUniqueSms=Nb dof unique phone numbers NbOfSms=Nbre of phon numbers ThisIsATestMessage=This is a test message diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang index 0d22a3b3c75..951178b8183 100644 --- a/htdocs/langs/en_US/stocks.lang +++ b/htdocs/langs/en_US/stocks.lang @@ -55,20 +55,20 @@ PMPValueShort=WAP EnhancedValueOfWarehouses=Warehouses value UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product -IndependantSubProductStock=Product stock and subproduct stock are independant +IndependantSubProductStock=Product stock and subproduct stock are independent QtyDispatched=Quantity dispatched QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch OrderDispatch=Item receipts -RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated) -RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated) -DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation -DeStockOnValidateOrder=Decrease real stocks on customers orders validation +RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated) +RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated) +DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note +DeStockOnValidateOrder=Decrease real stocks on validation of customer order DeStockOnShipment=Decrease real stocks on shipping validation DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed -ReStockOnBill=Increase real stocks on suppliers invoices/credit notes validation -ReStockOnValidateOrder=Increase real stocks on purchase orders approbation -ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods +ReStockOnBill=Increase real stocks on validation of supplier invoice/credit note +ReStockOnValidateOrder=Increase real stocks on purchase order approval +ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after supplier order receipt of goods OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses. StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required. @@ -130,9 +130,9 @@ RecordMovement=Record transfer ReceivingForSameOrder=Receipts for this order StockMovementRecorded=Stock movements recorded RuleForStockAvailability=Rules on stock requirements -StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever is rule for automatic stock change) -StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change) -StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change) +StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change) +StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change) +StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change) MovementLabel=Label of movement DateMovement=Date of movement InventoryCode=Movement or inventory code @@ -172,7 +172,7 @@ inventoryDraft=Running inventorySelectWarehouse=Warehouse choice inventoryConfirmCreate=Create inventoryOfWarehouse=Inventory for warehouse : %s -inventoryErrorQtyAdd=Error : one quantity is leaser than zero +inventoryErrorQtyAdd=Error : one quantity is less than zero inventoryMvtStock=By inventory inventoryWarningProductAlreadyExists=This product is already into list SelectCategory=Category filter @@ -195,12 +195,12 @@ AddInventoryProduct=Add product to inventory AddProduct=Add ApplyPMP=Apply PMP FlushInventory=Flush inventory -ConfirmFlushInventory=Do you confirm this action ? +ConfirmFlushInventory=Do you confirm this action? InventoryFlushed=Inventory flushed ExitEditMode=Exit edition inventoryDeleteLine=Delete line RegulateStock=Regulate Stock ListInventory=List -StockSupportServices=Stock management support services +StockSupportServices=Stock management supports Services StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service" ReceiveProducts=Receive items \ No newline at end of file diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang index 21935b5dae0..6286f19b8dc 100644 --- a/htdocs/langs/en_US/website.lang +++ b/htdocs/langs/en_US/website.lang @@ -1,8 +1,8 @@ # Dolibarr language file - Source file is en_US - website Shortname=Code -WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them. +WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them. DeleteWebsite=Delete website -ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. +ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGE_EXAMPLE=Web page to use as example WEBSITE_PAGENAME=Page name/alias @@ -74,7 +74,7 @@ AnotherContainer=Another container WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty YouMustDefineTheHomePage=You must first define the default Home page -OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available) +OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initialized by grabbing it from an external page (WYSIWYG editor will not be available) OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site GrabImagesInto=Grab also images found into css and page. ImagesShouldBeSavedInto=Images should be saved into directory diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang index 5a25a9e96e2..aadc12802a0 100644 --- a/htdocs/langs/en_US/withdrawals.lang +++ b/htdocs/langs/en_US/withdrawals.lang @@ -26,7 +26,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts MakeWithdrawRequest=Make a direct debit payment request WithdrawRequestsDone=%s direct debit payment requests recorded ThirdPartyBankCode=Third party bank code -NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode %s. +NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode %s. ClassCredited=Classify credited ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account? TransData=Transmission date diff --git a/htdocs/langs/en_US/workflow.lang b/htdocs/langs/en_US/workflow.lang index ed19a531c07..3dab69667c4 100644 --- a/htdocs/langs/en_US/workflow.lang +++ b/htdocs/langs/en_US/workflow.lang @@ -1,20 +1,20 @@ # Dolibarr language file - Source file is en_US - workflow WorkflowSetup=Workflow module setup -WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in. +WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions. ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules. # Autocreate -descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal) -descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal) +descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (the new order will have same amount as the proposal) +descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal) descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated -descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order) +descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (the new invoice will have same amount as the order) # Autoclassify customer proposal or order -descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals) -descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals) -descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders) -descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders) -descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update) +descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal) +descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal) +descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order) +descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order) +descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update) # Autoclassify supplier order -descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals) -descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders) +descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal) +descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order) AutomaticCreation=Automatic creation AutomaticClassification=Automatic classification \ No newline at end of file diff --git a/htdocs/user/card.php b/htdocs/user/card.php index e60d948aa48..8fd979015bf 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -1203,8 +1203,11 @@ else $res=$object->fetch_optionals(); // Check if user has rights - $object->getrights(); - if (empty($object->nb_rights) && $object->statut != 0) setEventMessages($langs->trans('UserHasNoPermissions'), null, 'warnings'); + if (empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) + { + $object->getrights(); + if (empty($object->nb_rights) && $object->statut != 0) setEventMessages($langs->trans('UserHasNoPermissions'), null, 'warnings'); + } // Connexion ldap // pour recuperer passDoNotExpire et userChangePassNextLogon diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index f83b2e85e72..b57c64dd0ad 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -487,8 +487,15 @@ class User extends CommonObject // Where pour la liste des droits a ajouter if (! empty($allmodule)) { - $whereforadd="module='".$this->db->escape($allmodule)."'"; - if (! empty($allperms)) $whereforadd.=" AND perms='".$this->db->escape($allperms)."'"; + if ($allmodule == 'allmodules') + { + $whereforadd='allmodules'; + } + else + { + $whereforadd="module='".$this->db->escape($allmodule)."'"; + if (! empty($allperms)) $whereforadd.=" AND perms='".$this->db->escape($allperms)."'"; + } } } @@ -498,8 +505,10 @@ class User extends CommonObject //print "$module-$perms-$subperms"; $sql = "SELECT id"; $sql.= " FROM ".MAIN_DB_PREFIX."rights_def"; - $sql.= " WHERE ".$whereforadd; - $sql.= " AND entity = ".$entity; + $sql.= " WHERE entity = ".$entity; + if (! empty($whereforadd) && $whereforadd != 'allmodules') { + $sql.= " AND ".$whereforadd; + } $result=$this->db->query($sql); if ($result) @@ -600,8 +609,18 @@ class User extends CommonObject else { // On a demande suppression d'un droit sur la base d'un nom de module ou perms // Where pour la liste des droits a supprimer - if (! empty($allmodule)) $wherefordel="module='".$this->db->escape($allmodule)."'"; - if (! empty($allperms)) $wherefordel=" AND perms='".$this->db->escape($allperms)."'"; + if (! empty($allmodule)) + { + if ($allmodule == 'allmodules') + { + $wherefordel='allmodules'; + } + else + { + $wherefordel="module='".$this->db->escape($allmodule)."'"; + if (! empty($allperms)) $whereforadd.=" AND perms='".$this->db->escape($allperms)."'"; + } + } } // Suppression des droits selon critere defini dans wherefordel @@ -610,8 +629,10 @@ class User extends CommonObject //print "$module-$perms-$subperms"; $sql = "SELECT id"; $sql.= " FROM ".MAIN_DB_PREFIX."rights_def"; - $sql.= " WHERE $wherefordel"; - $sql.= " AND entity = ".$entity; + $sql.= " WHERE entity = ".$entity; + if (! empty($wherefordel) && $wherefordel != 'allmodules') { + $sql.= " AND ".$wherefordel; + } $result=$this->db->query($sql); if ($result) diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php index 2400c855a6d..882e9111b5d 100644 --- a/htdocs/user/class/usergroup.class.php +++ b/htdocs/user/class/usergroup.class.php @@ -308,8 +308,18 @@ class UserGroup extends CommonObject } else { // Where pour la liste des droits a ajouter - if (! empty($allmodule)) $whereforadd="module='".$this->db->escape($allmodule)."'"; - if (! empty($allperms)) $whereforadd=" AND perms='".$this->db->escape($allperms)."'"; + if (! empty($allmodule)) + { + if ($allmodule == 'allmodules') + { + $whereforadd='allmodules'; + } + else + { + $whereforadd="module='".$this->db->escape($allmodule)."'"; + if (! empty($allperms)) $whereforadd.=" AND perms='".$this->db->escape($allperms)."'"; + } + } } // Ajout des droits de la liste whereforadd @@ -318,8 +328,10 @@ class UserGroup extends CommonObject //print "$module-$perms-$subperms"; $sql = "SELECT id"; $sql.= " FROM ".MAIN_DB_PREFIX."rights_def"; - $sql.= " WHERE $whereforadd"; - $sql.= " AND entity = ".$entity; + $sql.= " WHERE entity = ".$entity; + if (! empty($whereforadd) && $whereforadd != 'allmodules') { + $sql.= " AND ".$whereforadd; + } $result=$this->db->query($sql); if ($result) @@ -422,8 +434,18 @@ class UserGroup extends CommonObject } else { // Where pour la liste des droits a supprimer - if (! empty($allmodule)) $wherefordel="module='".$this->db->escape($allmodule)."'"; - if (! empty($allperms)) $wherefordel=" AND perms='".$this->db->escape($allperms)."'"; + if (! empty($allmodule)) + { + if ($allmodule == 'allmodules') + { + $wherefordel='allmodules'; + } + else + { + $wherefordel="module='".$this->db->escape($allmodule)."'"; + if (! empty($allperms)) $whereforadd.=" AND perms='".$this->db->escape($allperms)."'"; + } + } } // Suppression des droits de la liste wherefordel @@ -432,8 +454,10 @@ class UserGroup extends CommonObject //print "$module-$perms-$subperms"; $sql = "SELECT id"; $sql.= " FROM ".MAIN_DB_PREFIX."rights_def"; - $sql.= " WHERE $wherefordel"; - $sql.= " AND entity = ".$entity; + $sql.= " WHERE entity = ".$entity; + if (! empty($wherefordel) && $wherefordel != 'allmodules') { + $sql.= " AND ".$wherefordel; + } $result=$this->db->query($sql); if ($result) diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php index c1f8d1fe5b0..0d019b1226c 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -231,7 +231,14 @@ if ($object->id > 0) print '
'.$langs->trans("DefaultLanguage").' : '; +print ''.$langs->trans("DefaultLanguage").' : '; print $formadmin->select_language('auto','selectlang',1,0,0,1); print '
".$langs->trans("ErrorDirDoesNotExists",$main_data_dir); print ' '.$langs->trans("YouMustCreateItAndAllowServerToWrite"); print ''; - print ''.$langs->trans("Error").''; + print ''.$langs->trans("Error").''; print "

'.$langs->trans("CorrectProblemAndReloadPage",$_SERVER['PHP_SELF'].'?testget=ok').'
".$langs->trans("ErrorDirDoesNotExists",$main_data_dir); print ' '.$langs->trans("YouMustCreateItAndAllowServerToWrite"); print ''; - print ''.$langs->trans("Error").''; + print ''.$langs->trans("Error").''; print "

'.$langs->trans("CorrectProblemAndReloadPage",$_SERVER['PHP_SELF'].'?testget=ok').'
Ok
Error

'; print $langs->trans("YouAskDatabaseCreationSoDolibarrNeedToConnect",$dolibarr_main_db_user,$dolibarr_main_db_host,$userroot); print '
'; @@ -640,10 +640,10 @@ if (! $error && $db->connected && $action == "set") $error++; } } - } // Fin si "creation utilisateur" + } // end of user account creation - // If database creation is asked, we create it + // If database creation was asked, we create it if (!$error && (isset($db_create_database) && ($db_create_database == "1" || $db_create_database == "on"))) { dolibarr_install_syslog("step1: create database: " . $dolibarr_main_db_name . " " . $dolibarr_main_db_character_set . " " . $dolibarr_main_db_collation . " " . $dolibarr_main_db_user); $newdb=getDoliDBInstance($conf->db->type,$conf->db->host,$userroot,$passroot,'',$conf->db->port); @@ -672,7 +672,7 @@ if (! $error && $db->connected && $action == "set") } else { - // Affiche aide diagnostique + // warning message print '

'; print $langs->trans("ErrorFailedToCreateDatabase",$dolibarr_main_db_name).'
'; print $newdb->lasterror().'
'; @@ -693,7 +693,7 @@ if (! $error && $db->connected && $action == "set") print '		Error

'; print $langs->trans("YouAskDatabaseCreationSoDolibarrNeedToConnect",$dolibarr_main_db_user,$dolibarr_main_db_host,$userroot); print '
'; @@ -703,7 +703,7 @@ if (! $error && $db->connected && $action == "set") $error++; } - } // Fin si "creation database" + } // end of create database // We test access with dolibarr database user (not admin) @@ -724,7 +724,7 @@ if (! $error && $db->connected && $action == "set") print 'Ok'; print "

'; print $langs->trans('CheckThatDatabasenameIsCorrect',$dolibarr_main_db_name).'
'; print $langs->trans('IfAlreadyExistsCheckOption').'
'; @@ -767,7 +767,7 @@ if (! $error && $db->connected && $action == "set") print 'Error'; print "

'; print $langs->trans("ErrorConnection",$conf->db->host,$conf->db->name,$conf->db->user); print $langs->trans('IfLoginDoesNotExistsCheckCreateUser').'
'; @@ -1023,7 +1023,7 @@ function write_conf_file($conffile) if (file_exists("$conffile")) { - include $conffile; // On force rechargement. Ne pas mettre include_once ! + include $conffile; // force config reload, do not put include_once conf($dolibarr_main_document_root); print "
"; diff --git a/htdocs/install/step2.php b/htdocs/install/step2.php index 30b3ff7d64f..b9adb5dac21 100644 --- a/htdocs/install/step2.php +++ b/htdocs/install/step2.php @@ -58,7 +58,7 @@ if ($dolibarr_main_db_type == "sqlite3") $choix=5; //if (empty($choix)) dol_print_error('','Database type '.$dolibarr_main_db_type.' not supported into step2.php page'); -// Now we load forced value from install.forced.php file. +// Now we load forced values from install.forced.php file. $useforcedwizard=false; $forcedfile="./install.forced.php"; if ($conffile == "/etc/dolibarr/conf.php") $forcedfile="/etc/dolibarr/install.forced.php"; @@ -67,7 +67,7 @@ if (@file_exists($forcedfile)) { include_once $forcedfile; } -dolibarr_install_syslog("--- step2: entering step2.php page"); +dolibarr_install_syslog("- step2: entering step2.php page"); /* @@ -88,7 +88,7 @@ if ($action == "set") { print '

Database '.$langs->trans("Database").'

'; - print ''; + print '
'; $error=0; $db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port); @@ -237,7 +237,7 @@ if ($action == "set") print ""; - print ''; + print ''; $error++; } } @@ -246,7 +246,7 @@ if ($action == "set") { print ""; - print ''; + print ''; $error++; dolibarr_install_syslog("step2: failed to open file " . $dir . $file, LOG_ERR); } @@ -384,7 +384,7 @@ if ($action == "set") print ""; - print ''; + print ''; $error++; } } @@ -395,7 +395,7 @@ if ($action == "set") { print ""; - print '"; + print '"; $error++; dolibarr_install_syslog("step2: failed to open file " . $dir . $file, LOG_ERR); } @@ -417,7 +417,7 @@ if ($action == "set") ***************************************************************************************/ if ($ok && $createfunctions) { - // For this file, we use directory according to database type + // For this file, we use a directory according to database type if ($choix==1) $dir = "mysql/functions/"; elseif ($choix==2) $dir = "pgsql/functions/"; elseif ($choix==3) $dir = "mssql/functions/"; @@ -473,7 +473,7 @@ if ($action == "set") print ""; - print ''; + print ''; $error++; } } @@ -594,7 +594,7 @@ if ($action == "set") { $ok = 0; $okallfile = 0; - print ''.$langs->trans("ErrorSQL")." : ".$db->lasterrno()." - ".$db->lastqueryerror()." - ".$db->lasterror()."
"; + print ''.$langs->trans("ErrorSQL")." : ".$db->lasterrno()." - ".$db->lastqueryerror()." - ".$db->lasterror()."
"; } } } @@ -627,7 +627,7 @@ $ret=0; if (!$ok && isset($argv[1])) $ret=1; dolibarr_install_syslog("Exit ".$ret); -dolibarr_install_syslog("--- step2: end"); +dolibarr_install_syslog("- step2: end"); pFooter($ok?0:1,$setuplang); @@ -635,4 +635,3 @@ if (isset($db) && is_object($db)) $db->close(); // Return code if ran from command line if ($ret) exit($ret); - diff --git a/htdocs/install/step4.php b/htdocs/install/step4.php index 92bcb3dc1a7..64d6993cc94 100644 --- a/htdocs/install/step4.php +++ b/htdocs/install/step4.php @@ -47,7 +47,7 @@ if (@file_exists($forcedfile)) { include_once $forcedfile; } -dolibarr_install_syslog("--- step4: entering step4.php page"); +dolibarr_install_syslog("- step4: entering step4.php page"); $error=0; $ok = 0; @@ -74,18 +74,18 @@ print '


'; -print '

".$langs->trans("CreateTableAndPrimaryKey",$name); print "
\n".$langs->trans("Request").' '.$requestnb.' : '.$buffer.'
Executed query : '.$db->lastquery; print "\n		'.$langs->trans("ErrorSQL")." ".$db->errno()." ".$db->error().'
'.$langs->trans("ErrorSQL")." ".$db->errno()." ".$db->error().'
".$langs->trans("CreateTableAndPrimaryKey",$name); print "'.$langs->trans("Error").' Failed to open file '.$dir.$file.'
'.$langs->trans("Error").' Failed to open file '.$dir.$file.'
".$langs->trans("CreateOtherKeysForTable",$name); print "
\n".$langs->trans("Request").' '.$requestnb.' : '.$db->lastqueryerror(); print "\n		'.$langs->trans("ErrorSQL")." ".$db->errno()." ".$db->error().'
'.$langs->trans("ErrorSQL")." ".$db->errno()." ".$db->error().'
".$langs->trans("CreateOtherKeysForTable",$name); print "'.$langs->trans("Error")." Failed to open file ".$dir.$file."
'.$langs->trans("Error")." Failed to open file ".$dir.$file."
".$langs->trans("FunctionsCreation"); print "
\n".$langs->trans("Request").' '.$requestnb.' : '.$buffer; print "\n		'.$langs->trans("ErrorSQL")." ".$db->errno()." ".$db->error().'
'.$langs->trans("ErrorSQL")." ".$db->errno()." ".$db->error().'
'; +print '
'; $db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port); if ($db->ok) { - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; print '
'.$langs->trans("Login").' :'; - print '
'.$langs->trans("Password").' :'; - print '
'.$langs->trans("PasswordAgain").' :'; - print '
'; + print '
'; + print '
'; + print '
'; if (isset($_GET["error"]) && $_GET["error"] == 1) @@ -113,12 +113,11 @@ if ($db->ok) } - $ret=0; if ($error && isset($argv[1])) $ret=1; dolibarr_install_syslog("Exit ".$ret); -dolibarr_install_syslog("--- step4: end"); +dolibarr_install_syslog("- step4: end"); pFooter($error,$setuplang); diff --git a/htdocs/install/step5.php b/htdocs/install/step5.php index 79fead3c51d..845c3aa8a02 100644 --- a/htdocs/install/step5.php +++ b/htdocs/install/step5.php @@ -23,7 +23,7 @@ /** * \file htdocs/install/step5.php * \ingroup install - * \brief Last page of upgrade or install process + * \brief Last page of upgrade / install process */ include_once 'inc.php'; @@ -67,7 +67,7 @@ if ($conffile == "/etc/dolibarr/conf.php") $forcedfile="/etc/dolibarr/install.fo if (@file_exists($forcedfile)) { $useforcedwizard = true; include_once $forcedfile; - // If forced install is enabled, let's replace post values. These are empty because form fields are disabled. + // If forced install is enabled, replace post values. These are empty because form fields are disabled. if ($force_install_noedit == 2) { if (!empty($force_install_dolibarrlogin)) { $login = $force_install_dolibarrlogin; @@ -75,16 +75,15 @@ if (@file_exists($forcedfile)) { } } -dolibarr_install_syslog("--- step5: entering step5.php page"); +dolibarr_install_syslog("- step5: entering step5.php page"); $error=0; - /* * Actions */ -// If install, check pass and pass_verif used to create admin account +// If install, check password and password_verification used to create admin account if ($action == "set") { if ($pass <> $pass_verif) { header("Location: step4.php?error=1&selectlang=$setuplang" . (isset($login) ? '&login=' . $login : '')); @@ -394,8 +393,8 @@ if ($action == "set" && $success) else { // If here MAIN_VERSION_LAST_UPGRADE is not empty - print $langs->trans("VersionLastUpgrade").': '.$conf->global->MAIN_VERSION_LAST_UPGRADE.'
'; - print $langs->trans("VersionProgram").': '.DOL_VERSION.'
'; + print $langs->trans("VersionLastUpgrade").': '.$conf->global->MAIN_VERSION_LAST_UPGRADE.'
'; + print $langs->trans("VersionProgram").': '.DOL_VERSION.'
'; print $langs->trans("MigrationNotFinished").'
'; print "
"; @@ -442,8 +441,8 @@ elseif (empty($action) || preg_match('/upgrade/i',$action)) else { // If here MAIN_VERSION_LAST_UPGRADE is not empty - print $langs->trans("VersionLastUpgrade").': '.$conf->global->MAIN_VERSION_LAST_UPGRADE.'
'; - print $langs->trans("VersionProgram").': '.DOL_VERSION.''; + print $langs->trans("VersionLastUpgrade").': '.$conf->global->MAIN_VERSION_LAST_UPGRADE.'
'; + print $langs->trans("VersionProgram").': '.DOL_VERSION.''; print "
"; @@ -457,17 +456,14 @@ else dol_print_error('','step5.php: unknown choice of action'); } - - // Clear cache files clearstatcache(); - $ret=0; if ($error && isset($argv[1])) $ret=1; dolibarr_install_syslog("Exit ".$ret); -dolibarr_install_syslog("--- step5: Dolibarr setup finished"); +dolibarr_install_syslog("- step5: Dolibarr setup finished"); pFooter(1,$setuplang); diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php index f6e1b535706..6838f5c6e19 100644 --- a/htdocs/install/upgrade.php +++ b/htdocs/install/upgrade.php @@ -300,7 +300,7 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09 { if ($db->lasterrno() != 'DB_ERROR_NOSUCHTABLE') { - print '
'.$sql.' : '.$db->lasterror()."
'.$sql.' : '.$db->lasterror()."
'; print ''; print ''; - if ($caneditperms) print ''; + if ($caneditperms) + { + print ''; + } print ''; print ''; print ''; diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index 0a8e2bbbb80..30b988d3b22 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -260,7 +260,14 @@ print "\n"; print '
'.$langs->trans("Module").' '; + print ''.$langs->trans("All").""; + print '/'; + print ''.$langs->trans("None").""; + print ' '.$langs->trans("Permissions").'
'; print ''; print ''; -if ($caneditperms) print ''; +if ($caneditperms && empty($objMod->rights_admin_allowed) || empty($object->admin)) +{ + print ''; +} print ''; print ''; print ''."\n";
'.$langs->trans("Module").' '; + print ''.$langs->trans("All").""; + print '/'; + print ''.$langs->trans("None").""; + print ' '.$langs->trans("Permissions").'