From f92f92d34e0e344478a514fd23b9692b3c22fb2c Mon Sep 17 00:00:00 2001 From: quenenni Date: Fri, 18 Aug 2017 15:32:16 +0200 Subject: [PATCH] =?UTF-8?q?suppresion=20des=20textes=20'=C3=A0=20traduire'?= =?UTF-8?q?=20+=20corr=20de=202=20bugs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- awstats/bureau/class/m_aws.php | 2 +- bureau/admin/adm_authip_whitelist.php | 2 +- bureau/admin/bro_main.php | 32 +++++++++++++-------------- bureau/admin/hta_doadd.php | 2 +- bureau/admin/hta_doadduser.php | 2 +- bureau/admin/hta_dodeluser.php | 2 +- bureau/admin/ip_main.php | 8 +++---- bureau/admin/mail_doedit.php | 2 +- bureau/admin/piwik_addaccount.php | 2 +- bureau/admin/piwik_sitelist.php | 2 +- bureau/admin/piwik_user_dodel.php | 2 +- bureau/admin/piwik_userlist.php | 8 +++---- bureau/class/m_authip.php | 2 +- bureau/class/m_mail.php | 2 +- bureau/class/m_piwik.php | 11 +++++---- bureau/class/m_quota.php | 2 +- 16 files changed, 43 insertions(+), 40 deletions(-) diff --git a/awstats/bureau/class/m_aws.php b/awstats/bureau/class/m_aws.php index 199e6b5f..0a0e6a31 100644 --- a/awstats/bureau/class/m_aws.php +++ b/awstats/bureau/class/m_aws.php @@ -678,7 +678,7 @@ class m_aws { return false; } if (!preg_match('/^[0-9a-z_-]*$/', $postfix)){ - $msg->raise('Error', "aws", _("There is some forbidden characters in the login (only A-Z 0-9 _ and - are allowed)")); // à traduire + $msg->raise('Error', "aws", _("There is some forbidden characters in the login (only A-Z 0-9 _ and - are allowed)")); return false; } return $login; diff --git a/bureau/admin/adm_authip_whitelist.php b/bureau/admin/adm_authip_whitelist.php index 700085bc..70ed44f6 100755 --- a/bureau/admin/adm_authip_whitelist.php +++ b/bureau/admin/adm_authip_whitelist.php @@ -15,7 +15,7 @@ getFields($fields); if (!empty($delete_id)) { if (! $authip->ip_delete($delete_id)) { - $msg->raise('Error', "admin", _("Error during deletion")); // à traduire + $msg->raise('Error', "admin", _("Error during deletion")); } } diff --git a/bureau/admin/bro_main.php b/bureau/admin/bro_main.php index 86924b35..80b61dde 100755 --- a/bureau/admin/bro_main.php +++ b/bureau/admin/bro_main.php @@ -71,13 +71,13 @@ if (!empty($formu) && $formu) { switch ($formu) { case 1: // Create the folder $R.$nomfich if ($bro->CreateDir($R,$nomfich)) { - $msg->raise("Ok", "bro", _("The folder '%s' was successfully created"), $nomfich); // à traduire + $msg->raise("Ok", "bro", _("The folder '%s' was successfully created"), $nomfich); } $p=$bro->GetPrefs(); break; case 6: // Create the file $R.$nomfich if ($bro->CreateFile($R,$nomfich)) { - $msg->raise("Ok", "bro", _("The file '%s' was successfully created"), $nomfich); // à traduire + $msg->raise("Ok", "bro", _("The file '%s' was successfully created"), $nomfich); } $p=$bro->GetPrefs(); if ($p["createfile"]==1) { @@ -92,9 +92,9 @@ if (!empty($formu) && $formu) { if ($bro->DeleteFile($d,$R)) { foreach ($d as $v) { if (is_dir($absolute . "/" . $v)) - $msg->raise("Ok", "bro", _("The folder '%s' was successfully deleted"), $v); // à traduire + $msg->raise("Ok", "bro", _("The folder '%s' was successfully deleted"), $v); else - $msg->raise("Ok", "bro", _("The file '%s' was successfully deleted"), $v); // à traduire + $msg->raise("Ok", "bro", _("The file '%s' was successfully deleted"), $v); } } } elseif (empty($cancel) && is_array($d)) { @@ -128,22 +128,22 @@ if (!empty($formu) && $formu) { if ($bro->CopyFile($d,$R,$actmoveto)) { if (count($d) == 1) { if (is_dir($absolute . "/" . $d[0])) - $msg->raise("Ok", "bro", _("The folder '%s' was successfully copied to '%s'"), array($d[0], $actmoveto)); // à traduire + $msg->raise("Ok", "bro", _("The folder '%s' was successfully copied to '%s'"), array($d[0], $actmoveto)); else - $msg->raise("Ok", "bro", _("The file '%s' was successfully copied to '%s'"), array($d[0], $actmoveto)); // à traduire + $msg->raise("Ok", "bro", _("The file '%s' was successfully copied to '%s'"), array($d[0], $actmoveto)); } else - $msg->raise("Ok", "bro", _("The files / folders were successfully copied")); // à traduire + $msg->raise("Ok", "bro", _("The files / folders were successfully copied")); } } if ($actmove) { if ($bro->MoveFile($d,$R,$actmoveto)) { if (count($d) == 1) { if (is_dir($absolute . "/" . $d[0])) - $msg->raise("Ok", "bro", _("The folder '%s' was successfully moved to '%s'"), array($d[0], $actmoveto)); // à traduire + $msg->raise("Ok", "bro", _("The folder '%s' was successfully moved to '%s'"), array($d[0], $actmoveto)); else - $msg->raise("Ok", "bro", _("The file '%s' was successfully moved to '%s'"), array($d[0], $actmoveto)); // à traduire + $msg->raise("Ok", "bro", _("The file '%s' was successfully moved to '%s'"), array($d[0], $actmoveto)); } else - $msg->raise("Ok", "bro", _("The files / folders were successfully moved")); // à traduire + $msg->raise("Ok", "bro", _("The files / folders were successfully moved")); } } break; @@ -151,21 +151,21 @@ if (!empty($formu) && $formu) { if ($bro->RenameFile($R,$o,$d)) { // Rename $R (directory) $o (old) $d (new) names if (count($d) == 1) { if (is_dir($absolute . "/" . $d[0])) - $msg->raise("Ok", "bro", _("The folder '%s' was successfully renamed to '%s'"), array($o[0], $d[0])); // à traduire + $msg->raise("Ok", "bro", _("The folder '%s' was successfully renamed to '%s'"), array($o[0], $d[0])); else - $msg->raise("Ok", "bro", _("The file '%s' was successfully renamed to '%s'"), array($o[0], $d[0])); // à traduire + $msg->raise("Ok", "bro", _("The file '%s' was successfully renamed to '%s'"), array($o[0], $d[0])); } else - $msg->raise("Ok", "bro", _("The files / folders were successfully renamed")); // à traduire + $msg->raise("Ok", "bro", _("The files / folders were successfully renamed")); } break; case 3: // Upload de fichier... if ($bro->UploadFile($R)) { - $msg->raise("Ok", "bro", _("The file '%s' was successfully uploaded"), $_FILES['userfile']['name']); // à traduire + $msg->raise("Ok", "bro", _("The file '%s' was successfully uploaded"), $_FILES['userfile']['name']); } break; case 7: // Changement de permissions [ML] if ($bro->ChangePermissions($R, $d)) { - $msg->raise("Ok", "bro", _("The permissions were successfully set")); // à traduire + $msg->raise("Ok", "bro", _("The permissions were successfully set")); } break; } @@ -173,7 +173,7 @@ if (!empty($formu) && $formu) { if (isset($actextract) && $actextract) { if ($bro->ExtractFile($R. '/' . $fileextract, $R)) { - $msg->raise("Ok", "bro", _("The extraction of the file '%s' was successfull"), $fileextract); // à traduire + $msg->raise("Ok", "bro", _("The extraction of the file '%s' was successfull"), $fileextract); } } diff --git a/bureau/admin/hta_doadd.php b/bureau/admin/hta_doadd.php index 1789b4f4..7b773fb4 100644 --- a/bureau/admin/hta_doadd.php +++ b/bureau/admin/hta_doadd.php @@ -42,7 +42,7 @@ if(empty($dir)) { $is_include=true; include("hta_add.php"); } else { - $msg->raise("Ok", "hta", _("Folder %s is protected"), $dir); // à traduire + $msg->raise("Ok", "hta", _("Folder %s is protected"), $dir); include("hta_list.php"); } ?> diff --git a/bureau/admin/hta_doadduser.php b/bureau/admin/hta_doadduser.php index d9b0ef65..f3d75f1d 100644 --- a/bureau/admin/hta_doadduser.php +++ b/bureau/admin/hta_doadduser.php @@ -46,7 +46,7 @@ if ($password != $passwordconf) { if (!$hta->add_user($user, $password, $dir)) { include ("hta_adduser.php"); } else { - $msg->raise("Ok", "hta", _("The user %s was added to th protected folder %s"), array($user, $dir)); // à traduire + $msg->raise("Ok", "hta", _("The user %s was added to th protected folder %s"), array($user, $dir)); include ("hta_edit.php"); } ?> diff --git a/bureau/admin/hta_dodeluser.php b/bureau/admin/hta_dodeluser.php index 3b8d7a33..a4fcd5e6 100755 --- a/bureau/admin/hta_dodeluser.php +++ b/bureau/admin/hta_dodeluser.php @@ -40,7 +40,7 @@ if (!empty($confirm_del)) { reset($d); if ($hta->del_user($d,$dir)) { foreach ($d as $v) { - $msg->raise("Ok", "hta", _("The user '%s' was successfully deleted"), $v); // à traduire + $msg->raise("Ok", "hta", _("The user '%s' was successfully deleted"), $v); } } $is_include=true; diff --git a/bureau/admin/ip_main.php b/bureau/admin/ip_main.php index 6c2e01ed..d8f87f89 100755 --- a/bureau/admin/ip_main.php +++ b/bureau/admin/ip_main.php @@ -20,25 +20,25 @@ if (!empty($s_protocol)) { getFields($fields); if (! $authip->ip_affected_save($s_ipsub, $s_protocol, $$val) ) { - $msg->raise('Error', "ftp", _("Error during ip_affected_save")); // à traduire + $msg->raise('Error', "ftp", _("Error during ip_affected_save")); } } if (!empty($delete_affected_id)) { if (! $authip->ip_affected_delete($delete_affected_id)) { - $msg->raise('Error', "ftp", _("Error during deletion")); // à traduire + $msg->raise('Error', "ftp", _("Error during deletion")); } } if (!empty($delete_id)) { if (! $authip->ip_delete($delete_id)) { - $msg->raise('Error', "ftp", _("Error during deletion")); // à traduire + $msg->raise('Error', "ftp", _("Error during deletion")); } } if (!empty($ipsub)) { if (! $authip->ip_save($id, $ipsub, $infos)) { - $msg->raise('Error', "ftp", _("Error during recording")); // à traduire + $msg->raise('Error', "ftp", _("Error during recording")); } } diff --git a/bureau/admin/mail_doedit.php b/bureau/admin/mail_doedit.php index 1336fb32..29138356 100644 --- a/bureau/admin/mail_doedit.php +++ b/bureau/admin/mail_doedit.php @@ -104,7 +104,7 @@ if (!$res=$mail->get_details($mail_id)) { } if ($new_account) - $msg->raise("Ok", "mail", _("Your email has been created successfully")); // à traduire + $msg->raise("Ok", "mail", _("Your email has been created successfully")); else $msg->raise("Ok", "mail", _("Your email has been edited successfully")); diff --git a/bureau/admin/piwik_addaccount.php b/bureau/admin/piwik_addaccount.php index e8d37fdc..ae899c33 100644 --- a/bureau/admin/piwik_addaccount.php +++ b/bureau/admin/piwik_addaccount.php @@ -43,7 +43,7 @@ $fields = array ( getFields($fields); if ($piwik->user_add($account_name, $account_mail) ) { - $msg->raise('Ok', "piwik", _('Successfully added piwik account')); // à traduire (ou à corriger) + $msg->raise('Ok', "piwik", _('Successfully added piwik account')); } include_once("piwik_userlist.php"); ?> diff --git a/bureau/admin/piwik_sitelist.php b/bureau/admin/piwik_sitelist.php index eddd8a4d..20e38ee4 100755 --- a/bureau/admin/piwik_sitelist.php +++ b/bureau/admin/piwik_sitelist.php @@ -162,7 +162,7 @@ foreach ($sitelist as $site ){ - + user_has_sites()) { - $msg->raise('Alert', "piwik", _("You must first remove all the piwik sites associated with this user before deleting him")); // à traduire + $msg->raise('Alert', "piwik", _("To be able to delete the last user account, you must first remove all the piwik sites")); } else if ($piwik->user_delete($login) ) { $msg->raise('Ok', "piwik", _("Account %s is successfully deleted"), $login); } diff --git a/bureau/admin/piwik_userlist.php b/bureau/admin/piwik_userlist.php index 4d450ea8..b1a5a645 100755 --- a/bureau/admin/piwik_userlist.php +++ b/bureau/admin/piwik_userlist.php @@ -44,11 +44,11 @@ echo $msg->msg_html_all("
  • ", true, true); - + - +
    user["login"]; ?>_
    "/>
    @@ -74,7 +74,7 @@ echo $msg->msg_html_all("
  • ", true, true); // printVar($piwik->dev()); if (empty($userslist)){ - $msg->raise('Info', "piwik", _("No existing Piwik accounts")); // à traduire (ou à corriger) + $msg->raise('Info', "piwik", _("No existing Piwik accounts")); echo $msg->msg_html_all(); } else { ?> @@ -125,7 +125,7 @@ foreach ($userslist as $user ){ ?>
  • -