From 910f6b620018cc22ff21602b43522535e8a91e54 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 11 Jun 2007 07:26:04 +0000 Subject: [PATCH] Mise a jour traduction --- htdocs/admin/mails.php | 12 ++++++------ htdocs/langs/en_US/admin.lang | 6 ++++++ htdocs/langs/en_US/main.lang | 1 + htdocs/langs/fr_FR/admin.lang | 6 ++++++ htdocs/langs/fr_FR/main.lang | 1 + 5 files changed, 20 insertions(+), 6 deletions(-) diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index 795d710e486..f8311e430a8 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -71,13 +71,13 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') print ''.$langs->trans("Parameter").''.$langs->trans("Value").''; $var=!$var; - print ''.$langs->trans("MAIN_MAIL_SMTP_PORT").''; + print ''.$langs->trans("MAIN_MAIL_SMTP_PORT",ini_get('smtp_port')?ini_get('smtp_port'):$langs->transnoentities("Undefined")).''; $var=!$var; - print ''.$langs->trans("MAIN_MAIL_SMTP_SERVER").''; + print ''.$langs->trans("MAIN_MAIL_SMTP_SERVER",ini_get('SMTP')?ini_get('SMTP'):$langs->transnoentities("Undefined")).''; $var=!$var; - print ''.$langs->trans("MAIN_MAIL_EMAIL_FROM").''; + print ''.$langs->trans("MAIN_MAIL_EMAIL_FROM",ini_get('sendmail_from')?ini_get('sendmail_from'):$langs->transnoentities("Undefined")).''; $var=!$var; print ''.$langs->trans("MAIN_DISABLE_ALL_MAILS").''; @@ -101,13 +101,13 @@ else print ''.$langs->trans("Parameter").''.$langs->trans("Value").''; $var=!$var; - print ''.$langs->trans("MAIN_MAIL_SMTP_PORT").''.$conf->global->MAIN_MAIL_SMTP_PORT.''; + print ''.$langs->trans("MAIN_MAIL_SMTP_PORT",ini_get('smtp_port')?ini_get('smtp_port'):$langs->transnoentities("Undefined")).''.$conf->global->MAIN_MAIL_SMTP_PORT.''; $var=!$var; - print ''.$langs->trans("MAIN_MAIL_SMTP_SERVER").''.$conf->global->MAIN_MAIL_SMTP_SERVER.''; + print ''.$langs->trans("MAIN_MAIL_SMTP_SERVER",ini_get('SMTP')?ini_get('SMTP'):$langs->transnoentities("Undefined")).''.$conf->global->MAIN_MAIL_SMTP_SERVER.''; $var=!$var; - print ''.$langs->trans("MAIN_MAIL_EMAIL_FROM").''.$conf->global->MAIN_MAIL_EMAIL_FROM.''; + print ''.$langs->trans("MAIN_MAIL_EMAIL_FROM",ini_get('sendmail_from')?ini_get('sendmail_from'):$langs->transnoentities("Undefined")).''.$conf->global->MAIN_MAIL_EMAIL_FROM.''; $var=!$var; print ''.$langs->trans("MAIN_DISABLE_ALL_MAILS").''.yn($conf->global->MAIN_DISABLE_ALL_MAILS).''; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 629d604d511..73c8a99b1ac 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -111,6 +111,12 @@ OfficialWebSiteFr=French official web site CurrentTheme=Current theme CurrentTopMenuHandler=Current top menu handler CurrentLeftMenuHandler=Current left menu handler +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 this parameters are useless. +MAIN_MAIL_SMTP_PORT=SMTP Port (By default in php.ini: %s) +MAIN_MAIL_SMTP_SERVER=SMTP Host (By default in php.ini: %s) +MAIN_MAIL_EMAIL_FROM=Sender EMail for automatic emails (By default in php.ini: %s) +MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes) ModuleSetup=Module setup ModulesSetup=Modules setup ModuleFamilyBase=System diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 5fcd726152e..fd8f65e9e6d 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -33,6 +33,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. We rollback change ErrorConfigParameterNotDefined=Parameter %s is not defined inside Dolibarr config file conf.php. ErrorCantLoadUserFromDolibarrDatabase=Failed to find user %s in Dolibarr database. DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is setup to %s in configuration file conf.php.
This means that password database is extern to Dolibarr, so changing this field may have no effects. +Undefined=Undefined PasswordForgotten=Password forgotten ? SeeAbove=See above HomeArea=Home area diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index ced462fae81..acb14edb94f 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -112,6 +112,12 @@ OfficialWebSiteFr=Site web officiel francophone CurrentTheme=Theme courant CurrentTopMenuHandler=Gestionnaire menu haut courant CurrentLeftMenuHandler=Gestionnaire menu gauche courant +EMailsSetup=Configuration EMails +EMailsDesc=Cette page permet de remplacer les paramètres PHP en rapport avec l'envoi de mails. Dans la plupart des cas sur des OS comme Unix/Linux, les paramètres PHP sont déjà correcte et cette page est inutile. +MAIN_MAIL_SMTP_PORT=Port du serveur SMTP (Par défaut dans php.ini: %s) +MAIN_MAIL_SMTP_SERVER=Nom host ou ip du serveur SMTP (Par défaut dans php.ini: %s) +MAIN_MAIL_EMAIL_FROM=EMail emmetteur pour envoi emails automatiques (Par défaut dans php.ini: %s) +MAIN_DISABLE_ALL_MAILS=Désactiver globallement tout envoi de mails (pour mode test) ModuleSetup=Configuration du module ModulesSetup=Configuration des modules ModuleFamilyBase=Système diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 8cd05e20da8..19e724b4184 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -33,6 +33,7 @@ ErrorSomeErrorWereFoundRollbackIsDone=Des erreurs ont ErrorConfigParameterNotDefined=Le parametre %s n'est pas défini dans le fichier de configuration Dolibarr conf.php. ErrorCantLoadUserFromDolibarrDatabase=Impossible de trouver l'utilisateur %s dans la base Dolibarr. DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr est configuré en mode authentification %s dans son fichier de configuration conf.php.
Cela signifie que la base des mots de passe est externe à Dolibarr, aussi toute modification de ce champ peut s'avérer sans effet. +Undefined=Non défini PasswordForgotten=Mot de passe oublié ? SeeAbove=Voir ci-dessus HomeArea=Espace accueil