diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index da441327e5b..638064fd1dd 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -36,6 +36,7 @@ require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'); $langs->load("admin"); $langs->load("errors"); $langs->load("orders"); +$langs->load('other'); if (! $user->admin) accessforbidden(); @@ -289,7 +290,7 @@ foreach ($dirmodels as $reldir) // Show example of numbering module print ''; $tmp=$module->getExample(); - if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print '
'.$langs->trans($tmp).'
'; } + if (preg_match('/^Error/',$tmp)) print '
'.$langs->trans($tmp).'
'; elseif ($tmp=='NotConfigured') print $langs->trans($tmp); else print $tmp; print ''."\n"; diff --git a/htdocs/admin/dons.php b/htdocs/admin/dons.php index b71cdb76e2a..789884702c6 100644 --- a/htdocs/admin/dons.php +++ b/htdocs/admin/dons.php @@ -27,6 +27,7 @@ require_once(DOL_DOCUMENT_ROOT."/compta/dons/class/don.class.php"); $langs->load("admin"); $langs->load("donations"); +$langs->load('other'); if (!$user->admin) accessforbidden(); diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php index 3d0fac4c72b..1adc2ecc660 100644 --- a/htdocs/admin/expedition.php +++ b/htdocs/admin/expedition.php @@ -35,6 +35,7 @@ require_once(DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'); $langs->load("admin"); $langs->load("sendings"); $langs->load("deliveries"); +$langs->load('other'); if (!$user->admin) accessforbidden(); diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index f7e501635cb..eb88d57be98 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -32,6 +32,7 @@ require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); $langs->load("admin"); $langs->load("errors"); +$langs->load('other'); if (! $user->admin) accessforbidden(); @@ -368,7 +369,7 @@ foreach ($dirmodels as $reldir) // Show example of numbering module print ''; $tmp=$module->getExample(); - if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print '
'.$langs->trans($tmp).'
'; } + if (preg_match('/^Error/',$tmp)) print '
'.$langs->trans($tmp).'
'; elseif ($tmp=='NotConfigured') print $langs->trans($tmp); else print $tmp; print ''."\n"; diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php index d2c93328129..4aac5a88fed 100644 --- a/htdocs/admin/fichinter.php +++ b/htdocs/admin/fichinter.php @@ -35,6 +35,7 @@ require_once(DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'); $langs->load("admin"); $langs->load("errors"); $langs->load("interventions"); +$langs->load('other'); if (! $user->admin) accessforbidden(); @@ -251,7 +252,7 @@ foreach ($dirmodels as $reldir) // Show example of numbering module print ''; $tmp=$module->getExample(); - if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print '
'.$langs->trans($tmp).'
'; } + if (preg_match('/^Error/',$tmp)) print '
'.$langs->trans($tmp).'
'; elseif ($tmp=='NotConfigured') print $langs->trans($tmp); else print $tmp; print ''."\n"; diff --git a/htdocs/admin/fournisseur.php b/htdocs/admin/fournisseur.php index 64abda9ce27..efc3b826b2a 100644 --- a/htdocs/admin/fournisseur.php +++ b/htdocs/admin/fournisseur.php @@ -34,6 +34,7 @@ require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'); require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'); $langs->load("admin"); +$langs->load('other'); if (!$user->admin) accessforbidden(); diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php index 01b60b15c97..f23b73a766d 100644 --- a/htdocs/admin/livraison.php +++ b/htdocs/admin/livraison.php @@ -34,6 +34,7 @@ require_once(DOL_DOCUMENT_ROOT."/livraison/class/livraison.class.php"); $langs->load("admin"); $langs->load("sendings"); $langs->load("deliveries"); +$langs->load('other'); if (!$user->admin) accessforbidden(); diff --git a/htdocs/admin/project.php b/htdocs/admin/project.php index b50c14918c6..ad67ba3a317 100644 --- a/htdocs/admin/project.php +++ b/htdocs/admin/project.php @@ -216,7 +216,7 @@ foreach ($dirmodels as $reldir) // Show example of numbering module print ''; $tmp=$module->getExample(); - if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print '
'.$langs->trans($tmp).'
'; } + if (preg_match('/^Error/',$tmp)) print '
'.$langs->trans($tmp).'
'; elseif ($tmp=='NotConfigured') print $langs->trans($tmp); else print $tmp; print ''."\n"; diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php index babbfa8ad32..1d9a4e919a2 100644 --- a/htdocs/admin/propal.php +++ b/htdocs/admin/propal.php @@ -34,6 +34,7 @@ require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); $langs->load("admin"); $langs->load("errors"); +$langs->load('other'); if (! $user->admin) accessforbidden(); @@ -274,7 +275,7 @@ foreach ($dirmodels as $reldir) // Show example of numbering module print ''; $tmp=$module->getExample(); - if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print '
'.$langs->trans($tmp).'
'; } + if (preg_match('/^Error/',$tmp)) print '
'.$langs->trans($tmp).'
'; elseif ($tmp=='NotConfigured') print $langs->trans($tmp); else print $tmp; print ''."\n"; diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php index aa835cdd96e..a24d7f38d89 100644 --- a/htdocs/admin/syslog.php +++ b/htdocs/admin/syslog.php @@ -187,7 +187,7 @@ $var=!$var; print ' '.$langs->trans("SyslogSyslog").''; print ''.$langs->trans("SyslogFacility").': '; print ''; -print "".$form->textwithpicto('','Only LOG_USER supported on Windows'); +print "".$form->textwithpicto('', $langs->trans('OnlyWindowsLOG_USER')); print ''; try diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index a88818ff66e..2dc2d0fb45c 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1147,6 +1147,7 @@ SyslogSimpleFile=File SyslogFilename=File name and path YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file. ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant +OnlyWindowsLOG_USER=Windows only supports LOG_USER ##### Donations ##### DonationsSetup=Donation module setup DonationsReceiptModel=Template of donation receipt diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index 012e9c38ba8..6814f7daad5 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -910,7 +910,7 @@ UsersSetup=Configuración del módulo usuarios UserMailRequired=E-Mail necesario para crear un usuario nuevo ##### Company setup ##### CompanySetup=Configuración del módulo empresas -CompanyCodeChecker=Módulo de generación e control de los códigos de terceros (clientes/proveedores) +CompanyCodeChecker=Módulo de generación y control de los códigos de terceros (clientes/proveedores) AccountCodeManager=Módulo de generación de los códigos contables (clientes/proveedores) ModuleCompanyCodeAquarium=Devuelve un código contable compuesto de
%s seguido del código tercero de proveedor para el código contable de proveedor,
%s seguido del código tercero de cliente para el código contable de cliente. ModuleCompanyCodePanicum=Devuelve un código contable vacío. @@ -1161,6 +1161,7 @@ SyslogSimpleFile=Archivo SyslogFilename=Nombre y ruta del archivo YouCanUseDOL_DATA_ROOT=Puede utilizar DOL_DATA_ROOT/dolibarr.log para un registro en el directorio "documentos" de Dolibarr. Sin embargo, puede establecer un directorio diferente para guardar este archivo. ErrorUnknownSyslogConstant=La constante %s no es una constante syslog conocida +OnlyWindowsLOG_USER=Windows sólo soporta LOG_USER ##### Donations ##### DonationsSetup=Configuración del módulo donaciones DonationsReceiptModel=Modelo recepción de donaciones diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index cd75fe7a822..a6b91499d6b 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -1154,6 +1154,7 @@ SyslogSimpleFile= Fichier SyslogFilename= Nom et chemin du fichier YouCanUseDOL_DATA_ROOT= Vous pouvez utiliser DOL_DATA_ROOT/dolibarr.log pour un log dans le répertoire "documents" de Dolibarr. Vous pouvez néanmoins définir un chemin différent pour stocker ce fichier. ErrorUnknownSyslogConstant= La constante %s n'est pas une constante syslog connue +OnlyWindowsLOG_USER=Windows ne supporte que LOG_USER ##### Donations ##### DonationsSetup= Configuration du module Dons DonationsReceiptModel= Modèle de reçu de dons