From: Frédéric Marchal Date: Thu, 10 Jun 2010 08:49:48 +0000 (+0000) Subject: Replace redirector_ignore_date by redirector_filter_out_date that behave as the name... X-Git-Tag: v2.3-pre5~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=64dfb824d6f0741edcde3999993c413abc61c8e4;p=thirdparty%2Fsarg.git Replace redirector_ignore_date by redirector_filter_out_date that behave as the name implies. Replace dansguardian_ignore_date by dansguardian_filter_out_date that behave as the name implies. Initialize the variables used when reading a redirector log with a custom format. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 36005f6..2d36772 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ PROJECT(sarg C) SET(sarg_VERSION 2) SET(sarg_REVISION "3-pre5") SET(sarg_BUILD "") -SET(sarg_BUILDDATE "Jun-09-2010") +SET(sarg_BUILDDATE "Jun-10-2010") INCLUDE(AddFileDependencies) INCLUDE(CheckIncludeFile) diff --git a/ChangeLog b/ChangeLog index fc39088..6ad69d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ SARG ChangeLog -Jun-09-2009 Version 2.3-pre5 +Jun-10-2009 Version 2.3-pre5 - LDAP usertab added. Now you can have your users in a LDAP Server. Use these tags in sarg.conf: LDAPHost, LDAPPort, LDAPBindDN, LDAPBindPW, @@ -47,6 +47,8 @@ Jun-09-2009 Version 2.3-pre5 - Sarg can output the internal css inlined in the reports. It replaces the css.tpl distributed with the sources. - Command line option -l is optional. The input log files may be named on the command line without prefixing them with -l. It allows the use of wildcards in the command line. - Accept unlimited URL length in the redirector log (thanks to Joseph L Casale). + - Replace redirector_ignore_date by redirector_filter_out_date that behave as the name implies. + - Replace dansguardian_ignore_date by dansguardian_filter_out_date that behave as the name implies. Feb-10-2010 Version 2.2.7.1 - Fixed compilation error reported by some compilers due to an sizeof in a fprintf (thanks to Maxim Britov and Renato Botelho). diff --git a/dansguardian_log.c b/dansguardian_log.c index 7d069d0..c6d081b 100644 --- a/dansguardian_log.c +++ b/dansguardian_log.c @@ -113,7 +113,7 @@ void dansguardian_log(void) sprintf(wdata,"%s%02d%s",year,atoi(mon),day); idata = atoi(wdata); - if(DansguardianIgnoreDate) { + if(DansguardianFilterOutDate) { if(idata < dfrom && idata > duntil) continue; } diff --git a/getconf.c b/getconf.c index f089baf..ba95198 100644 --- a/getconf.c +++ b/getconf.c @@ -596,13 +596,27 @@ static void parmtest(char *buf) return; } - if (getparam_bool("redirector_ignore_date",buf,&RedirectorIgnoreDate)>0) return; - if (getparam_bool("squidguard_ignore_date",buf,&RedirectorIgnoreDate)>0) { - debuga(_("squidguard_ignore_date is deprecated and has been replaced by redirector_ignore_date. Please update your configuration file.\n")); + if (getparam_bool("redirector_filter_out_date",buf,&RedirectorFilterOutDate)>0) return; + if (getparam_bool("redirector_ignore_date",buf,&RedirectorFilterOutDate)>0) { + /* + Due to an old bug in sarg before version 2.3, the option was having the opposite action than implied by the name. + */ + debuga(_("redirector_ignore_date is deprecated and has been replaced by redirector_filter_out_date that does the action implied by its name as opposed to redirector_ignore_date. Please update your configuration file.\n")); + RedirectorFilterOutDate=!RedirectorFilterOutDate; + return; + } + if (getparam_bool("squidguard_ignore_date",buf,&RedirectorFilterOutDate)>0) { + debuga(_("squidguard_ignore_date is deprecated and has been replaced by redirector_filter_out_date that does the action implied by its name as opposed to squidguard_ignore_date. Please update your configuration file.\n")); + RedirectorFilterOutDate=!RedirectorFilterOutDate; return; } - if (getparam_bool("dansguardian_ignore_date",buf,&DansguardianIgnoreDate)>0) return; + if (getparam_bool("dansguardian_filter_out_date",buf,&DansguardianFilterOutDate)>0) return; + if (getparam_bool("dansguardian_ignore_date",buf,&DansguardianFilterOutDate)>0) { + debuga(_("dansguardian_ignore_date is deprecated and has been replaced by dansguardian_filter_out_date that does the action implied by its name as opposed to dansguardian_ignore_date. Please update your configuration file.\n")); + DansguardianFilterOutDate=!DansguardianFilterOutDate; + return; + } if (getparam_string("ulimit",buf,Ulimit,sizeof(Ulimit))>0) return; diff --git a/include/conf.h b/include/conf.h index 34a70ad..2d3e882 100755 --- a/include/conf.h +++ b/include/conf.h @@ -341,14 +341,14 @@ unsigned long int DataFileUrl; bool ShowReadStatistics; char IndexSortOrder[5]; char DansGuardianConf[MAXLEN]; -bool DansguardianIgnoreDate; +bool DansguardianFilterOutDate; char SquidGuardConf[MAXLEN]; char SquidGuarddbHome[255]; char RedirectorLogFormat[4096]; int NRedirectorLogs; char RedirectorLogs[MAX_REDIRECTOR_LOGS][MAX_REDIRECTOR_FILELEN]; int RedirectorLogFromCmdLine; -bool RedirectorIgnoreDate; +bool RedirectorFilterOutDate; bool ShowSargInfo; bool BytesInSitesUsersReport; bool ShowSargLogo; diff --git a/include/info.h b/include/info.h index 301a163..0556a87 100755 --- a/include/info.h +++ b/include/info.h @@ -1,3 +1,3 @@ -#define VERSION PACKAGE_VERSION" Jun-09-2010" +#define VERSION PACKAGE_VERSION" Jun-10-2010" #define PGM PACKAGE_NAME #define URL "http://sarg.sourceforge.net" diff --git a/log.c b/log.c index f368219..d6e61d1 100644 --- a/log.c +++ b/log.c @@ -281,8 +281,8 @@ int main(int argc,char *argv[]) IndexTree=INDEX_TREE_FILE; strcpy(RealtimeTypes,"GET,PUT,CONNECT"); RealtimeUnauthRec=REALTIME_UNAUTH_REC_SHOW; - RedirectorIgnoreDate=false; - DansguardianIgnoreDate=false; + RedirectorFilterOutDate=true; + DansguardianFilterOutDate=true; DataFileUrl=DATAFILEURL_IP; strcpy(MaxElapsed,"28800000"); BytesInSitesUsersReport=0; diff --git a/po/bg.po b/po/bg.po index 1ec8cc0..0248aac 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: sarg 2.3-pre1\n" "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n" -"POT-Creation-Date: 2010-06-09 07:34+0200\n" +"POT-Creation-Date: 2010-06-10 09:39+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -575,29 +575,46 @@ msgid "" "redirector_log_format. Please update your configuration file.\n" msgstr "" -#: getconf.c:601 +#: getconf.c:604 +#, c-format +msgid "" +"redirector_ignore_date is deprecated and has been replaced by " +"redirector_filter_out_date that does the action implied by its name as " +"opposed to redirector_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:609 #, c-format msgid "" "squidguard_ignore_date is deprecated and has been replaced by " -"redirector_ignore_date. Please update your configuration file.\n" +"redirector_filter_out_date that does the action implied by its name as " +"opposed to squidguard_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:616 +#, c-format +msgid "" +"dansguardian_ignore_date is deprecated and has been replaced by " +"dansguardian_filter_out_date that does the action implied by its name as " +"opposed to dansguardian_ignore_date. Please update your configuration file.\n" msgstr "" -#: getconf.c:645 getconf.c:650 +#: getconf.c:659 getconf.c:664 #, c-format msgid "The \"byte_cost\" parameter of the configuration file is invalid\n" msgstr "" -#: getconf.c:657 +#: getconf.c:671 #, fuzzy, c-format msgid "SARG: Unknown option %s\n" msgstr "Unknown option" -#: getconf.c:667 +#: getconf.c:681 #, fuzzy, c-format msgid "Loading configuration from %s\n" msgstr "Зарежда файла с изключенията от" -#: getconf.c:670 +#: getconf.c:684 #, fuzzy, c-format msgid "(getconf) Cannot open file %s\n" msgstr "Не мога да намеря файла" diff --git a/po/ca.po b/po/ca.po index a8a2b83..33df262 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: sarg 2.3\n" "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n" -"POT-Creation-Date: 2010-06-09 07:34+0200\n" +"POT-Creation-Date: 2010-06-10 09:39+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -575,29 +575,46 @@ msgid "" "redirector_log_format. Please update your configuration file.\n" msgstr "" -#: getconf.c:601 +#: getconf.c:604 +#, c-format +msgid "" +"redirector_ignore_date is deprecated and has been replaced by " +"redirector_filter_out_date that does the action implied by its name as " +"opposed to redirector_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:609 #, c-format msgid "" "squidguard_ignore_date is deprecated and has been replaced by " -"redirector_ignore_date. Please update your configuration file.\n" +"redirector_filter_out_date that does the action implied by its name as " +"opposed to squidguard_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:616 +#, c-format +msgid "" +"dansguardian_ignore_date is deprecated and has been replaced by " +"dansguardian_filter_out_date that does the action implied by its name as " +"opposed to dansguardian_ignore_date. Please update your configuration file.\n" msgstr "" -#: getconf.c:645 getconf.c:650 +#: getconf.c:659 getconf.c:664 #, c-format msgid "The \"byte_cost\" parameter of the configuration file is invalid\n" msgstr "" -#: getconf.c:657 +#: getconf.c:671 #, fuzzy, c-format msgid "SARG: Unknown option %s\n" msgstr "Unknown option" -#: getconf.c:667 +#: getconf.c:681 #, fuzzy, c-format msgid "Loading configuration from %s\n" msgstr "Llegint log de l'agent d'usuari" -#: getconf.c:670 +#: getconf.c:684 #, fuzzy, c-format msgid "(getconf) Cannot open file %s\n" msgstr "reports" diff --git a/po/cs.po b/po/cs.po index 074a0f1..dd36d10 100644 --- a/po/cs.po +++ b/po/cs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: sarg 2.3\n" "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n" -"POT-Creation-Date: 2010-06-09 07:34+0200\n" +"POT-Creation-Date: 2010-06-10 09:39+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -575,29 +575,46 @@ msgid "" "redirector_log_format. Please update your configuration file.\n" msgstr "" -#: getconf.c:601 +#: getconf.c:604 +#, c-format +msgid "" +"redirector_ignore_date is deprecated and has been replaced by " +"redirector_filter_out_date that does the action implied by its name as " +"opposed to redirector_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:609 #, c-format msgid "" "squidguard_ignore_date is deprecated and has been replaced by " -"redirector_ignore_date. Please update your configuration file.\n" +"redirector_filter_out_date that does the action implied by its name as " +"opposed to squidguard_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:616 +#, c-format +msgid "" +"dansguardian_ignore_date is deprecated and has been replaced by " +"dansguardian_filter_out_date that does the action implied by its name as " +"opposed to dansguardian_ignore_date. Please update your configuration file.\n" msgstr "" -#: getconf.c:645 getconf.c:650 +#: getconf.c:659 getconf.c:664 #, c-format msgid "The \"byte_cost\" parameter of the configuration file is invalid\n" msgstr "" -#: getconf.c:657 +#: getconf.c:671 #, fuzzy, c-format msgid "SARG: Unknown option %s\n" msgstr "Unknown option" -#: getconf.c:667 +#: getconf.c:681 #, fuzzy, c-format msgid "Loading configuration from %s\n" msgstr "Načítám soubor vyjímek z" -#: getconf.c:670 +#: getconf.c:684 #, fuzzy, c-format msgid "(getconf) Cannot open file %s\n" msgstr "Nemohu otevřít soubor" diff --git a/po/de.po b/po/de.po index 63bac1e..8c25525 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: sarg 2.3\n" "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n" -"POT-Creation-Date: 2010-06-09 07:34+0200\n" +"POT-Creation-Date: 2010-06-10 09:39+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -575,29 +575,46 @@ msgid "" "redirector_log_format. Please update your configuration file.\n" msgstr "" -#: getconf.c:601 +#: getconf.c:604 +#, c-format +msgid "" +"redirector_ignore_date is deprecated and has been replaced by " +"redirector_filter_out_date that does the action implied by its name as " +"opposed to redirector_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:609 #, c-format msgid "" "squidguard_ignore_date is deprecated and has been replaced by " -"redirector_ignore_date. Please update your configuration file.\n" +"redirector_filter_out_date that does the action implied by its name as " +"opposed to squidguard_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:616 +#, c-format +msgid "" +"dansguardian_ignore_date is deprecated and has been replaced by " +"dansguardian_filter_out_date that does the action implied by its name as " +"opposed to dansguardian_ignore_date. Please update your configuration file.\n" msgstr "" -#: getconf.c:645 getconf.c:650 +#: getconf.c:659 getconf.c:664 #, c-format msgid "The \"byte_cost\" parameter of the configuration file is invalid\n" msgstr "" -#: getconf.c:657 +#: getconf.c:671 #, fuzzy, c-format msgid "SARG: Unknown option %s\n" msgstr "Unknown option" -#: getconf.c:667 +#: getconf.c:681 #, fuzzy, c-format msgid "Loading configuration from %s\n" msgstr "Lade Ausschlussdatei aus" -#: getconf.c:670 +#: getconf.c:684 #, fuzzy, c-format msgid "(getconf) Cannot open file %s\n" msgstr "Kann Datei nicht oeffnen" diff --git a/po/el.po b/po/el.po index 660518e..85fd820 100644 --- a/po/el.po +++ b/po/el.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: sarg 2.3\n" "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n" -"POT-Creation-Date: 2010-06-09 07:34+0200\n" +"POT-Creation-Date: 2010-06-10 09:39+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -575,29 +575,46 @@ msgid "" "redirector_log_format. Please update your configuration file.\n" msgstr "" -#: getconf.c:601 +#: getconf.c:604 +#, c-format +msgid "" +"redirector_ignore_date is deprecated and has been replaced by " +"redirector_filter_out_date that does the action implied by its name as " +"opposed to redirector_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:609 #, c-format msgid "" "squidguard_ignore_date is deprecated and has been replaced by " -"redirector_ignore_date. Please update your configuration file.\n" +"redirector_filter_out_date that does the action implied by its name as " +"opposed to squidguard_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:616 +#, c-format +msgid "" +"dansguardian_ignore_date is deprecated and has been replaced by " +"dansguardian_filter_out_date that does the action implied by its name as " +"opposed to dansguardian_ignore_date. Please update your configuration file.\n" msgstr "" -#: getconf.c:645 getconf.c:650 +#: getconf.c:659 getconf.c:664 #, c-format msgid "The \"byte_cost\" parameter of the configuration file is invalid\n" msgstr "" -#: getconf.c:657 +#: getconf.c:671 #, fuzzy, c-format msgid "SARG: Unknown option %s\n" msgstr "Unknown option" -#: getconf.c:667 +#: getconf.c:681 #, fuzzy, c-format msgid "Loading configuration from %s\n" msgstr "Φόρτωση αρχείου εξαιρέσεων από" -#: getconf.c:670 +#: getconf.c:684 #, fuzzy, c-format msgid "(getconf) Cannot open file %s\n" msgstr "Δεν μπορώ να διαβάσω το αρχείο" diff --git a/po/es.po b/po/es.po index 24403da..86cea59 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: sarg 2.3\n" "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n" -"POT-Creation-Date: 2010-06-09 07:34+0200\n" +"POT-Creation-Date: 2010-06-10 09:39+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -576,29 +576,46 @@ msgid "" "redirector_log_format. Please update your configuration file.\n" msgstr "" -#: getconf.c:601 +#: getconf.c:604 +#, c-format +msgid "" +"redirector_ignore_date is deprecated and has been replaced by " +"redirector_filter_out_date that does the action implied by its name as " +"opposed to redirector_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:609 #, c-format msgid "" "squidguard_ignore_date is deprecated and has been replaced by " -"redirector_ignore_date. Please update your configuration file.\n" +"redirector_filter_out_date that does the action implied by its name as " +"opposed to squidguard_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:616 +#, c-format +msgid "" +"dansguardian_ignore_date is deprecated and has been replaced by " +"dansguardian_filter_out_date that does the action implied by its name as " +"opposed to dansguardian_ignore_date. Please update your configuration file.\n" msgstr "" -#: getconf.c:645 getconf.c:650 +#: getconf.c:659 getconf.c:664 #, c-format msgid "The \"byte_cost\" parameter of the configuration file is invalid\n" msgstr "" -#: getconf.c:657 +#: getconf.c:671 #, fuzzy, c-format msgid "SARG: Unknown option %s\n" msgstr "Unknown option" -#: getconf.c:667 +#: getconf.c:681 #, fuzzy, c-format msgid "Loading configuration from %s\n" msgstr "Cargando archivo de exclusiones desde" -#: getconf.c:670 +#: getconf.c:684 #, fuzzy, c-format msgid "(getconf) Cannot open file %s\n" msgstr "No se puede abrir archivo" diff --git a/po/fr.po b/po/fr.po index be3d86e..9a35723 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,10 +6,10 @@ # Frédéric Marchal , 2010. msgid "" msgstr "" -"Project-Id-Version: sarg 2.3-pre3\n" +"Project-Id-Version: sarg 2.3-pre5\n" "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n" -"POT-Creation-Date: 2010-06-09 07:34+0200\n" -"PO-Revision-Date: 2010-06-09 07:35+0200\n" +"POT-Creation-Date: 2010-06-10 09:39+0200\n" +"PO-Revision-Date: 2010-06-10 09:39+0200\n" "Last-Translator: Frédéric Marchal \n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -575,32 +575,58 @@ msgstr "" "redirector_log_format. Veuillez mettre à jour votre fichier de " "configuration.\n" -#: getconf.c:601 +#: getconf.c:604 +#, c-format +msgid "" +"redirector_ignore_date is deprecated and has been replaced by " +"redirector_filter_out_date that does the action implied by its name as " +"opposed to redirector_ignore_date. Please update your configuration file.\n" +msgstr "" +"redirector_ignore_date est abandonné et a été remplacé par " +"redirector_filter_out_date qui fait ce que son nom indique contrairement à " +"redirector_ignore_date. Veuillez mettre à jour votre fichier de " +"configuration.\n" + +#: getconf.c:609 #, c-format msgid "" "squidguard_ignore_date is deprecated and has been replaced by " -"redirector_ignore_date. Please update your configuration file.\n" +"redirector_filter_out_date that does the action implied by its name as " +"opposed to squidguard_ignore_date. Please update your configuration file.\n" msgstr "" "squidguard_ignore_date est abandonné et a été remplacé par " -"redirector_ignore_date. Veuillez mettre à jour votre fichier de " +"redirector_filter_out_date qui fait ce que son nom indique contrairement à " +"squidguard_ignore_date. Veuillez mettre à jour votre fichier de " "configuration.\n" -#: getconf.c:645 getconf.c:650 +#: getconf.c:616 +#, c-format +msgid "" +"dansguardian_ignore_date is deprecated and has been replaced by " +"dansguardian_filter_out_date that does the action implied by its name as " +"opposed to dansguardian_ignore_date. Please update your configuration file.\n" +msgstr "" +"dansguardian_ignore_date est abandonné et a été remplacé par " +"dansguardian_filter_out_date qui fait ce que son nom indique contrairement à " +"dansguardian_ignore_date. Veuillez mettre à jour votre fichier de " +"configuration.\n" + +#: getconf.c:659 getconf.c:664 #, c-format msgid "The \"byte_cost\" parameter of the configuration file is invalid\n" msgstr "Le paramètre «byte_cost» du fichier de configuration est incorrect\n" -#: getconf.c:657 +#: getconf.c:671 #, c-format msgid "SARG: Unknown option %s\n" msgstr "SARG: Option inconnue : %s\n" -#: getconf.c:667 +#: getconf.c:681 #, c-format msgid "Loading configuration from %s\n" msgstr "Lecture du fichier de configuration %s\n" -#: getconf.c:670 +#: getconf.c:684 #, c-format msgid "(getconf) Cannot open file %s\n" msgstr "(getconf) Impossible d'ouvrir le fichier %s\n" @@ -2020,7 +2046,9 @@ msgstr "Impossible d'ouvrir le fichier de configuration de squidGuard: %s\n" #: squidguard_report.c:79 #, c-format msgid "Not enough memory to read the processed redirector log\n" -msgstr "Pas assez de mémoire pour lire le fichier intermédiaire du journal du redirecteur\n" +msgstr "" +"Pas assez de mémoire pour lire le fichier intermédiaire du journal du " +"redirecteur\n" #: squidguard_report.c:83 squidguard_report.c:87 msgid "Redirector report" diff --git a/po/hu.po b/po/hu.po index edbbb08..5af6730 100644 --- a/po/hu.po +++ b/po/hu.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: sarg 2.3\n" "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n" -"POT-Creation-Date: 2010-06-09 07:34+0200\n" +"POT-Creation-Date: 2010-06-10 09:39+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -575,29 +575,46 @@ msgid "" "redirector_log_format. Please update your configuration file.\n" msgstr "" -#: getconf.c:601 +#: getconf.c:604 +#, c-format +msgid "" +"redirector_ignore_date is deprecated and has been replaced by " +"redirector_filter_out_date that does the action implied by its name as " +"opposed to redirector_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:609 #, c-format msgid "" "squidguard_ignore_date is deprecated and has been replaced by " -"redirector_ignore_date. Please update your configuration file.\n" +"redirector_filter_out_date that does the action implied by its name as " +"opposed to squidguard_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:616 +#, c-format +msgid "" +"dansguardian_ignore_date is deprecated and has been replaced by " +"dansguardian_filter_out_date that does the action implied by its name as " +"opposed to dansguardian_ignore_date. Please update your configuration file.\n" msgstr "" -#: getconf.c:645 getconf.c:650 +#: getconf.c:659 getconf.c:664 #, c-format msgid "The \"byte_cost\" parameter of the configuration file is invalid\n" msgstr "" -#: getconf.c:657 +#: getconf.c:671 #, fuzzy, c-format msgid "SARG: Unknown option %s\n" msgstr "Unknown option" -#: getconf.c:667 +#: getconf.c:681 #, fuzzy, c-format msgid "Loading configuration from %s\n" msgstr "Kizaró file beolvasása a" -#: getconf.c:670 +#: getconf.c:684 #, fuzzy, c-format msgid "(getconf) Cannot open file %s\n" msgstr "Megnyithatatlan file" diff --git a/po/id.po b/po/id.po index a2f173c..483d8e9 100644 --- a/po/id.po +++ b/po/id.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: sarg 2.3\n" "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n" -"POT-Creation-Date: 2010-06-09 07:34+0200\n" +"POT-Creation-Date: 2010-06-10 09:39+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -575,29 +575,46 @@ msgid "" "redirector_log_format. Please update your configuration file.\n" msgstr "" -#: getconf.c:601 +#: getconf.c:604 +#, c-format +msgid "" +"redirector_ignore_date is deprecated and has been replaced by " +"redirector_filter_out_date that does the action implied by its name as " +"opposed to redirector_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:609 #, c-format msgid "" "squidguard_ignore_date is deprecated and has been replaced by " -"redirector_ignore_date. Please update your configuration file.\n" +"redirector_filter_out_date that does the action implied by its name as " +"opposed to squidguard_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:616 +#, c-format +msgid "" +"dansguardian_ignore_date is deprecated and has been replaced by " +"dansguardian_filter_out_date that does the action implied by its name as " +"opposed to dansguardian_ignore_date. Please update your configuration file.\n" msgstr "" -#: getconf.c:645 getconf.c:650 +#: getconf.c:659 getconf.c:664 #, c-format msgid "The \"byte_cost\" parameter of the configuration file is invalid\n" msgstr "" -#: getconf.c:657 +#: getconf.c:671 #, fuzzy, c-format msgid "SARG: Unknown option %s\n" msgstr "Unknown option" -#: getconf.c:667 +#: getconf.c:681 #, fuzzy, c-format msgid "Loading configuration from %s\n" msgstr "Menyertakan file exclude dari" -#: getconf.c:670 +#: getconf.c:684 #, fuzzy, c-format msgid "(getconf) Cannot open file %s\n" msgstr "Tak bisa buka file" diff --git a/po/it.po b/po/it.po index 340a14b..0e65c94 100644 --- a/po/it.po +++ b/po/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: sarg 2.3\n" "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n" -"POT-Creation-Date: 2010-06-09 07:34+0200\n" +"POT-Creation-Date: 2010-06-10 09:39+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -575,29 +575,46 @@ msgid "" "redirector_log_format. Please update your configuration file.\n" msgstr "" -#: getconf.c:601 +#: getconf.c:604 +#, c-format +msgid "" +"redirector_ignore_date is deprecated and has been replaced by " +"redirector_filter_out_date that does the action implied by its name as " +"opposed to redirector_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:609 #, c-format msgid "" "squidguard_ignore_date is deprecated and has been replaced by " -"redirector_ignore_date. Please update your configuration file.\n" +"redirector_filter_out_date that does the action implied by its name as " +"opposed to squidguard_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:616 +#, c-format +msgid "" +"dansguardian_ignore_date is deprecated and has been replaced by " +"dansguardian_filter_out_date that does the action implied by its name as " +"opposed to dansguardian_ignore_date. Please update your configuration file.\n" msgstr "" -#: getconf.c:645 getconf.c:650 +#: getconf.c:659 getconf.c:664 #, c-format msgid "The \"byte_cost\" parameter of the configuration file is invalid\n" msgstr "" -#: getconf.c:657 +#: getconf.c:671 #, fuzzy, c-format msgid "SARG: Unknown option %s\n" msgstr "Unknown option" -#: getconf.c:667 +#: getconf.c:681 #, fuzzy, c-format msgid "Loading configuration from %s\n" msgstr "Caricamento exclude file da" -#: getconf.c:670 +#: getconf.c:684 #, fuzzy, c-format msgid "(getconf) Cannot open file %s\n" msgstr "Non riesco ad aprire il file" diff --git a/po/ja.po b/po/ja.po index d90ba95..83c9257 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: sarg 2.3\n" "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n" -"POT-Creation-Date: 2010-06-09 07:34+0200\n" +"POT-Creation-Date: 2010-06-10 09:39+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -575,29 +575,46 @@ msgid "" "redirector_log_format. Please update your configuration file.\n" msgstr "" -#: getconf.c:601 +#: getconf.c:604 +#, c-format +msgid "" +"redirector_ignore_date is deprecated and has been replaced by " +"redirector_filter_out_date that does the action implied by its name as " +"opposed to redirector_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:609 #, c-format msgid "" "squidguard_ignore_date is deprecated and has been replaced by " -"redirector_ignore_date. Please update your configuration file.\n" +"redirector_filter_out_date that does the action implied by its name as " +"opposed to squidguard_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:616 +#, c-format +msgid "" +"dansguardian_ignore_date is deprecated and has been replaced by " +"dansguardian_filter_out_date that does the action implied by its name as " +"opposed to dansguardian_ignore_date. Please update your configuration file.\n" msgstr "" -#: getconf.c:645 getconf.c:650 +#: getconf.c:659 getconf.c:664 #, c-format msgid "The \"byte_cost\" parameter of the configuration file is invalid\n" msgstr "" -#: getconf.c:657 +#: getconf.c:671 #, fuzzy, c-format msgid "SARG: Unknown option %s\n" msgstr "Unknown option" -#: getconf.c:667 +#: getconf.c:681 #, fuzzy, c-format msgid "Loading configuration from %s\n" msgstr "以下から排除するファイルを読み込んでいます" -#: getconf.c:670 +#: getconf.c:684 #, fuzzy, c-format msgid "(getconf) Cannot open file %s\n" msgstr "ファイルをオープンできません" diff --git a/po/lv.po b/po/lv.po index 886d7d9..73ddfbd 100644 --- a/po/lv.po +++ b/po/lv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: sarg 2.3-pre1\n" "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n" -"POT-Creation-Date: 2010-06-09 07:34+0200\n" +"POT-Creation-Date: 2010-06-10 09:39+0200\n" "PO-Revision-Date: 2010-04-25 20:35+0300\n" "Last-Translator: Juris Valdovskis \n" "Language-Team: Latvian \n" @@ -576,29 +576,46 @@ msgid "" "redirector_log_format. Please update your configuration file.\n" msgstr "" -#: getconf.c:601 +#: getconf.c:604 +#, c-format +msgid "" +"redirector_ignore_date is deprecated and has been replaced by " +"redirector_filter_out_date that does the action implied by its name as " +"opposed to redirector_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:609 #, c-format msgid "" "squidguard_ignore_date is deprecated and has been replaced by " -"redirector_ignore_date. Please update your configuration file.\n" +"redirector_filter_out_date that does the action implied by its name as " +"opposed to squidguard_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:616 +#, c-format +msgid "" +"dansguardian_ignore_date is deprecated and has been replaced by " +"dansguardian_filter_out_date that does the action implied by its name as " +"opposed to dansguardian_ignore_date. Please update your configuration file.\n" msgstr "" -#: getconf.c:645 getconf.c:650 +#: getconf.c:659 getconf.c:664 #, c-format msgid "The \"byte_cost\" parameter of the configuration file is invalid\n" msgstr "" -#: getconf.c:657 +#: getconf.c:671 #, fuzzy, c-format msgid "SARG: Unknown option %s\n" msgstr "Unknown option" -#: getconf.c:667 +#: getconf.c:681 #, fuzzy, c-format msgid "Loading configuration from %s\n" msgstr "Ielādēju izņēmumu failu no" -#: getconf.c:670 +#: getconf.c:684 #, fuzzy, c-format msgid "(getconf) Cannot open file %s\n" msgstr "Nevar atvērt failu" diff --git a/po/nl.po b/po/nl.po index b28c6e7..a52be52 100644 --- a/po/nl.po +++ b/po/nl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: sarg 2.3\n" "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n" -"POT-Creation-Date: 2010-06-09 07:34+0200\n" +"POT-Creation-Date: 2010-06-10 09:39+0200\n" "PO-Revision-Date: 2010-03-31 12:00+0100\n" "Last-Translator: Erwin Poeze \n" "Language-Team: Dutch \n" @@ -577,29 +577,46 @@ msgid "" "redirector_log_format. Please update your configuration file.\n" msgstr "" -#: getconf.c:601 +#: getconf.c:604 +#, c-format +msgid "" +"redirector_ignore_date is deprecated and has been replaced by " +"redirector_filter_out_date that does the action implied by its name as " +"opposed to redirector_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:609 #, c-format msgid "" "squidguard_ignore_date is deprecated and has been replaced by " -"redirector_ignore_date. Please update your configuration file.\n" +"redirector_filter_out_date that does the action implied by its name as " +"opposed to squidguard_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:616 +#, c-format +msgid "" +"dansguardian_ignore_date is deprecated and has been replaced by " +"dansguardian_filter_out_date that does the action implied by its name as " +"opposed to dansguardian_ignore_date. Please update your configuration file.\n" msgstr "" -#: getconf.c:645 getconf.c:650 +#: getconf.c:659 getconf.c:664 #, c-format msgid "The \"byte_cost\" parameter of the configuration file is invalid\n" msgstr "" -#: getconf.c:657 +#: getconf.c:671 #, fuzzy, c-format msgid "SARG: Unknown option %s\n" msgstr "Unknown option" -#: getconf.c:667 +#: getconf.c:681 #, fuzzy, c-format msgid "Loading configuration from %s\n" msgstr "Laden uitzondering bestand uit" -#: getconf.c:670 +#: getconf.c:684 #, fuzzy, c-format msgid "(getconf) Cannot open file %s\n" msgstr "Kan bestand niet openen" diff --git a/po/pl.po b/po/pl.po index 150ba1e..37754ca 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: sarg 2.3\n" "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n" -"POT-Creation-Date: 2010-06-09 07:34+0200\n" +"POT-Creation-Date: 2010-06-10 09:39+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -575,29 +575,46 @@ msgid "" "redirector_log_format. Please update your configuration file.\n" msgstr "" -#: getconf.c:601 +#: getconf.c:604 +#, c-format +msgid "" +"redirector_ignore_date is deprecated and has been replaced by " +"redirector_filter_out_date that does the action implied by its name as " +"opposed to redirector_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:609 #, c-format msgid "" "squidguard_ignore_date is deprecated and has been replaced by " -"redirector_ignore_date. Please update your configuration file.\n" +"redirector_filter_out_date that does the action implied by its name as " +"opposed to squidguard_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:616 +#, c-format +msgid "" +"dansguardian_ignore_date is deprecated and has been replaced by " +"dansguardian_filter_out_date that does the action implied by its name as " +"opposed to dansguardian_ignore_date. Please update your configuration file.\n" msgstr "" -#: getconf.c:645 getconf.c:650 +#: getconf.c:659 getconf.c:664 #, c-format msgid "The \"byte_cost\" parameter of the configuration file is invalid\n" msgstr "" -#: getconf.c:657 +#: getconf.c:671 #, fuzzy, c-format msgid "SARG: Unknown option %s\n" msgstr "Unknown option" -#: getconf.c:667 +#: getconf.c:681 #, fuzzy, c-format msgid "Loading configuration from %s\n" msgstr "Czytam plik wykluczenia z" -#: getconf.c:670 +#: getconf.c:684 #, fuzzy, c-format msgid "(getconf) Cannot open file %s\n" msgstr "Nie moїna otworzyж pliku" diff --git a/po/pt.po b/po/pt.po index 45a1803..fe2e23d 100644 --- a/po/pt.po +++ b/po/pt.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: sarg 2.3\n" "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n" -"POT-Creation-Date: 2010-06-09 07:34+0200\n" +"POT-Creation-Date: 2010-06-10 09:39+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -575,29 +575,46 @@ msgid "" "redirector_log_format. Please update your configuration file.\n" msgstr "" -#: getconf.c:601 +#: getconf.c:604 +#, c-format +msgid "" +"redirector_ignore_date is deprecated and has been replaced by " +"redirector_filter_out_date that does the action implied by its name as " +"opposed to redirector_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:609 #, c-format msgid "" "squidguard_ignore_date is deprecated and has been replaced by " -"redirector_ignore_date. Please update your configuration file.\n" +"redirector_filter_out_date that does the action implied by its name as " +"opposed to squidguard_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:616 +#, c-format +msgid "" +"dansguardian_ignore_date is deprecated and has been replaced by " +"dansguardian_filter_out_date that does the action implied by its name as " +"opposed to dansguardian_ignore_date. Please update your configuration file.\n" msgstr "" -#: getconf.c:645 getconf.c:650 +#: getconf.c:659 getconf.c:664 #, c-format msgid "The \"byte_cost\" parameter of the configuration file is invalid\n" msgstr "" -#: getconf.c:657 +#: getconf.c:671 #, fuzzy, c-format msgid "SARG: Unknown option %s\n" msgstr "Unknown option" -#: getconf.c:667 +#: getconf.c:681 #, fuzzy, c-format msgid "Loading configuration from %s\n" msgstr "Carregando arquivo de exclusao" -#: getconf.c:670 +#: getconf.c:684 #, fuzzy, c-format msgid "(getconf) Cannot open file %s\n" msgstr "Erro no open do arquivo" diff --git a/po/ro.po b/po/ro.po index 3fe8ec5..b07796d 100644 --- a/po/ro.po +++ b/po/ro.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: sarg 2.3\n" "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n" -"POT-Creation-Date: 2010-06-09 07:34+0200\n" +"POT-Creation-Date: 2010-06-10 09:39+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -575,29 +575,46 @@ msgid "" "redirector_log_format. Please update your configuration file.\n" msgstr "" -#: getconf.c:601 +#: getconf.c:604 +#, c-format +msgid "" +"redirector_ignore_date is deprecated and has been replaced by " +"redirector_filter_out_date that does the action implied by its name as " +"opposed to redirector_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:609 #, c-format msgid "" "squidguard_ignore_date is deprecated and has been replaced by " -"redirector_ignore_date. Please update your configuration file.\n" +"redirector_filter_out_date that does the action implied by its name as " +"opposed to squidguard_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:616 +#, c-format +msgid "" +"dansguardian_ignore_date is deprecated and has been replaced by " +"dansguardian_filter_out_date that does the action implied by its name as " +"opposed to dansguardian_ignore_date. Please update your configuration file.\n" msgstr "" -#: getconf.c:645 getconf.c:650 +#: getconf.c:659 getconf.c:664 #, c-format msgid "The \"byte_cost\" parameter of the configuration file is invalid\n" msgstr "" -#: getconf.c:657 +#: getconf.c:671 #, fuzzy, c-format msgid "SARG: Unknown option %s\n" msgstr "Unknown option" -#: getconf.c:667 +#: getconf.c:681 #, fuzzy, c-format msgid "Loading configuration from %s\n" msgstr "Se incarca fisierul de excluderi din" -#: getconf.c:670 +#: getconf.c:684 #, fuzzy, c-format msgid "(getconf) Cannot open file %s\n" msgstr "Nu poate fi deshis fisierul" diff --git a/po/ru.po b/po/ru.po index ef98858..9f1212c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: sarg 2.3-pre1\n" "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n" -"POT-Creation-Date: 2010-06-09 07:34+0200\n" +"POT-Creation-Date: 2010-06-10 09:39+0200\n" "PO-Revision-Date: 2010-05-13 18:22+0200\n" "Last-Translator: Pavel Maryanov \n" "Language-Team: Russian \n" @@ -567,29 +567,46 @@ msgid "" "redirector_log_format. Please update your configuration file.\n" msgstr "" -#: getconf.c:601 +#: getconf.c:604 +#, c-format +msgid "" +"redirector_ignore_date is deprecated and has been replaced by " +"redirector_filter_out_date that does the action implied by its name as " +"opposed to redirector_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:609 #, c-format msgid "" "squidguard_ignore_date is deprecated and has been replaced by " -"redirector_ignore_date. Please update your configuration file.\n" +"redirector_filter_out_date that does the action implied by its name as " +"opposed to squidguard_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:616 +#, c-format +msgid "" +"dansguardian_ignore_date is deprecated and has been replaced by " +"dansguardian_filter_out_date that does the action implied by its name as " +"opposed to dansguardian_ignore_date. Please update your configuration file.\n" msgstr "" -#: getconf.c:645 getconf.c:650 +#: getconf.c:659 getconf.c:664 #, c-format msgid "The \"byte_cost\" parameter of the configuration file is invalid\n" msgstr "" -#: getconf.c:657 +#: getconf.c:671 #, fuzzy, c-format msgid "SARG: Unknown option %s\n" msgstr "Unknown option" -#: getconf.c:667 +#: getconf.c:681 #, fuzzy, c-format msgid "Loading configuration from %s\n" msgstr "Загрузка исключений из" -#: getconf.c:670 +#: getconf.c:684 #, fuzzy, c-format msgid "(getconf) Cannot open file %s\n" msgstr "Не могу открыть файл" diff --git a/po/sk.po b/po/sk.po index 52e0c5f..ca84818 100644 --- a/po/sk.po +++ b/po/sk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: sarg 2.3\n" "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n" -"POT-Creation-Date: 2010-06-09 07:34+0200\n" +"POT-Creation-Date: 2010-06-10 09:39+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -575,29 +575,46 @@ msgid "" "redirector_log_format. Please update your configuration file.\n" msgstr "" -#: getconf.c:601 +#: getconf.c:604 +#, c-format +msgid "" +"redirector_ignore_date is deprecated and has been replaced by " +"redirector_filter_out_date that does the action implied by its name as " +"opposed to redirector_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:609 #, c-format msgid "" "squidguard_ignore_date is deprecated and has been replaced by " -"redirector_ignore_date. Please update your configuration file.\n" +"redirector_filter_out_date that does the action implied by its name as " +"opposed to squidguard_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:616 +#, c-format +msgid "" +"dansguardian_ignore_date is deprecated and has been replaced by " +"dansguardian_filter_out_date that does the action implied by its name as " +"opposed to dansguardian_ignore_date. Please update your configuration file.\n" msgstr "" -#: getconf.c:645 getconf.c:650 +#: getconf.c:659 getconf.c:664 #, c-format msgid "The \"byte_cost\" parameter of the configuration file is invalid\n" msgstr "" -#: getconf.c:657 +#: getconf.c:671 #, fuzzy, c-format msgid "SARG: Unknown option %s\n" msgstr "Unknown option" -#: getconf.c:667 +#: getconf.c:681 #, fuzzy, c-format msgid "Loading configuration from %s\n" msgstr "Načítávam súbor výnimok z" -#: getconf.c:670 +#: getconf.c:684 #, fuzzy, c-format msgid "(getconf) Cannot open file %s\n" msgstr "Nedá sa otvoriÅ¥ súbor" diff --git a/po/sr.po b/po/sr.po index 887e1d5..a289ce3 100644 --- a/po/sr.po +++ b/po/sr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: sarg 2.3\n" "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n" -"POT-Creation-Date: 2010-06-09 07:34+0200\n" +"POT-Creation-Date: 2010-06-10 09:39+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -575,29 +575,46 @@ msgid "" "redirector_log_format. Please update your configuration file.\n" msgstr "" -#: getconf.c:601 +#: getconf.c:604 +#, c-format +msgid "" +"redirector_ignore_date is deprecated and has been replaced by " +"redirector_filter_out_date that does the action implied by its name as " +"opposed to redirector_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:609 #, c-format msgid "" "squidguard_ignore_date is deprecated and has been replaced by " -"redirector_ignore_date. Please update your configuration file.\n" +"redirector_filter_out_date that does the action implied by its name as " +"opposed to squidguard_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:616 +#, c-format +msgid "" +"dansguardian_ignore_date is deprecated and has been replaced by " +"dansguardian_filter_out_date that does the action implied by its name as " +"opposed to dansguardian_ignore_date. Please update your configuration file.\n" msgstr "" -#: getconf.c:645 getconf.c:650 +#: getconf.c:659 getconf.c:664 #, c-format msgid "The \"byte_cost\" parameter of the configuration file is invalid\n" msgstr "" -#: getconf.c:657 +#: getconf.c:671 #, fuzzy, c-format msgid "SARG: Unknown option %s\n" msgstr "Unknown option" -#: getconf.c:667 +#: getconf.c:681 #, fuzzy, c-format msgid "Loading configuration from %s\n" msgstr "Ucitavanje exclude datoteke iz" -#: getconf.c:670 +#: getconf.c:684 #, fuzzy, c-format msgid "(getconf) Cannot open file %s\n" msgstr "Nemoguce otvoriti datoteku ili je los putokaz" diff --git a/po/tr.po b/po/tr.po index e69a353..bf521dd 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: sarg 2.3\n" "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n" -"POT-Creation-Date: 2010-06-09 07:34+0200\n" +"POT-Creation-Date: 2010-06-10 09:39+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -575,29 +575,46 @@ msgid "" "redirector_log_format. Please update your configuration file.\n" msgstr "" -#: getconf.c:601 +#: getconf.c:604 +#, c-format +msgid "" +"redirector_ignore_date is deprecated and has been replaced by " +"redirector_filter_out_date that does the action implied by its name as " +"opposed to redirector_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:609 #, c-format msgid "" "squidguard_ignore_date is deprecated and has been replaced by " -"redirector_ignore_date. Please update your configuration file.\n" +"redirector_filter_out_date that does the action implied by its name as " +"opposed to squidguard_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:616 +#, c-format +msgid "" +"dansguardian_ignore_date is deprecated and has been replaced by " +"dansguardian_filter_out_date that does the action implied by its name as " +"opposed to dansguardian_ignore_date. Please update your configuration file.\n" msgstr "" -#: getconf.c:645 getconf.c:650 +#: getconf.c:659 getconf.c:664 #, c-format msgid "The \"byte_cost\" parameter of the configuration file is invalid\n" msgstr "" -#: getconf.c:657 +#: getconf.c:671 #, fuzzy, c-format msgid "SARG: Unknown option %s\n" msgstr "Unknown option" -#: getconf.c:667 +#: getconf.c:681 #, fuzzy, c-format msgid "Loading configuration from %s\n" msgstr "Exclude dosyasi okunuyor" -#: getconf.c:670 +#: getconf.c:684 #, fuzzy, c-format msgid "(getconf) Cannot open file %s\n" msgstr "Dosya acilamiyor" diff --git a/po/uk.po b/po/uk.po index b70c927..39371d2 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: sarg 2.3\n" "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n" -"POT-Creation-Date: 2010-06-09 07:34+0200\n" +"POT-Creation-Date: 2010-06-10 09:39+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -574,29 +574,46 @@ msgid "" "redirector_log_format. Please update your configuration file.\n" msgstr "" -#: getconf.c:601 +#: getconf.c:604 +#, c-format +msgid "" +"redirector_ignore_date is deprecated and has been replaced by " +"redirector_filter_out_date that does the action implied by its name as " +"opposed to redirector_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:609 #, c-format msgid "" "squidguard_ignore_date is deprecated and has been replaced by " -"redirector_ignore_date. Please update your configuration file.\n" +"redirector_filter_out_date that does the action implied by its name as " +"opposed to squidguard_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:616 +#, c-format +msgid "" +"dansguardian_ignore_date is deprecated and has been replaced by " +"dansguardian_filter_out_date that does the action implied by its name as " +"opposed to dansguardian_ignore_date. Please update your configuration file.\n" msgstr "" -#: getconf.c:645 getconf.c:650 +#: getconf.c:659 getconf.c:664 #, c-format msgid "The \"byte_cost\" parameter of the configuration file is invalid\n" msgstr "" -#: getconf.c:657 +#: getconf.c:671 #, fuzzy, c-format msgid "SARG: Unknown option %s\n" msgstr "Unknown option" -#: getconf.c:667 +#: getconf.c:681 #, fuzzy, c-format msgid "Loading configuration from %s\n" msgstr "Завантаження виключень їз" -#: getconf.c:670 +#: getconf.c:684 #, fuzzy, c-format msgid "(getconf) Cannot open file %s\n" msgstr "Не можу відкрити файл" diff --git a/po/zh_CN.po b/po/zh_CN.po index 49448d0..f85f12c 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: sarg 2.3-pre3\n" "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n" -"POT-Creation-Date: 2010-06-09 07:34+0200\n" +"POT-Creation-Date: 2010-06-10 09:39+0200\n" "PO-Revision-Date: 2010-05-26 09:15+0800\n" "Last-Translator: Zhixiang Ren \n" "Language-Team: Chinese (simplified) \n" @@ -556,29 +556,46 @@ msgid "" "redirector_log_format. Please update your configuration file.\n" msgstr "" -#: getconf.c:601 +#: getconf.c:604 +#, c-format +msgid "" +"redirector_ignore_date is deprecated and has been replaced by " +"redirector_filter_out_date that does the action implied by its name as " +"opposed to redirector_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:609 #, c-format msgid "" "squidguard_ignore_date is deprecated and has been replaced by " -"redirector_ignore_date. Please update your configuration file.\n" +"redirector_filter_out_date that does the action implied by its name as " +"opposed to squidguard_ignore_date. Please update your configuration file.\n" +msgstr "" + +#: getconf.c:616 +#, c-format +msgid "" +"dansguardian_ignore_date is deprecated and has been replaced by " +"dansguardian_filter_out_date that does the action implied by its name as " +"opposed to dansguardian_ignore_date. Please update your configuration file.\n" msgstr "" -#: getconf.c:645 getconf.c:650 +#: getconf.c:659 getconf.c:664 #, c-format msgid "The \"byte_cost\" parameter of the configuration file is invalid\n" msgstr "ÅäÖÃÎļþµÄ\"byte_cost\"²ÎÊýÎÞЧ\n" -#: getconf.c:657 +#: getconf.c:671 #, c-format msgid "SARG: Unknown option %s\n" msgstr "SARG:δ֪µÄÑ¡Ïî%s\n" -#: getconf.c:667 +#: getconf.c:681 #, c-format msgid "Loading configuration from %s\n" msgstr "¼ÓÔØÅäÖÃÎļþ´Ó%s\n" -#: getconf.c:670 +#: getconf.c:684 #, c-format msgid "(getconf) Cannot open file %s\n" msgstr "£¨getconf£©ÎÞ·¨´ò¿ªÎļþ %s\n" diff --git a/sarg.conf b/sarg.conf index e007776..9f88cad 100644 --- a/sarg.conf +++ b/sarg.conf @@ -473,11 +473,13 @@ # #dansguardian_conf none -# TAG: dansguardian_ignore_date on|off -# 'on' must use the record even the date range is different from the used in squid access.log file. -# 'off' must use the record only if the date range is in the irange used in squid access.log file. +# TAG: dansguardian_filter_out_date on|off +# This option replaces dansguardian_ignore_date whose name was not appropriate with respect to its action. +# Note the change of parameter value compared with the old option. +# 'off' use the record even if its date is outside of the range found in the input log file. +# 'on' use the record only if its date is in the range found in the input log file. # -#dansguardian_ignore_date off +#dansguardian_filter_out_date on # TAG: squidguard_conf file # path to squidGuard.conf file @@ -496,12 +498,14 @@ # #redirector_log /usr/local/squidGuard/var/logs/urls.log -# TAG: redirector_ignore_date on|off -# was named squidguard_ignore_date before sarg 2.3 but was renamed as it is not specific to squidGuard. -# Set to 'on' to use the record even if the date is different from the date in the access log file. -# Set to 'off' to use the record only if the date is within the range found in the access log file. +# TAG: redirector_filter_out_date on|off +# This option replaces squidguard_ignore_date and redirector_ignore_date whose names were not +# appropriate with respect to their action. +# Note the change of parameter value compared with the old options. +# 'off' use the record even if its date is outside of the range found in the input log file. +# 'on' use the record only if its date is in the range found in the input log file. # -#redirector_ignore_date off +#redirector_filter_out_date on # TAG: redirector_log_format # Format string for web proxy redirector logs. diff --git a/squidguard_log.c b/squidguard_log.c index 4176df0..7926229 100644 --- a/squidguard_log.c +++ b/squidguard_log.c @@ -111,6 +111,12 @@ static void read_log(const char *wentp, FILE *fp_ou,int dfrom,int duntil) year=0; mon=0; day=0; + hour[0]='\0'; + source[0]='\0'; + list[0]='\0'; + ip[0]='\0'; + user[0]='\0'; + url[0]='\0'; while(strcmp(leks,"end") != 0) { if (getword(leks,sizeof(leks),&gwarea1,'#')<0 || getword(sep,sizeof(sep),&gwarea1,'#')<0) { debuga(_("Maybe you have a broken record or garbage in your %s file\n"),wentp); @@ -133,6 +139,12 @@ static void read_log(const char *wentp, FILE *fp_ou,int dfrom,int duntil) exit(EXIT_FAILURE); } strcpy(hour,res); + } else if(strcmp(leks,"source") == 0) { + if (strlen(res)>=sizeof(source)) { + debuga(_("Banning source name too long in redirector log file %s\n"),wentp); + exit(EXIT_FAILURE); + } + strcpy(source,res); } else if(strcmp(leks,"list") == 0) { if (strlen(res)>=sizeof(list)) { debuga(_("Banning list name too long in redirector log file %s\n"),wentp); @@ -213,7 +225,7 @@ static void read_log(const char *wentp, FILE *fp_ou,int dfrom,int duntil) //sprintf(warea,"%04d%02d%02d",year,mon,day); - if(RedirectorIgnoreDate) { + if(RedirectorFilterOutDate) { idata = year*10000+mon*100+day; if(idata < dfrom || idata > duntil) continue; @@ -242,7 +254,13 @@ static void read_log(const char *wentp, FILE *fp_ou,int dfrom,int duntil) if(Ip2Name && id_is_ip) ip2name(user,sizeof(user)); user_find(uinfo->label,MAX_USER_LEN, user); } - fprintf(fp_ou,"%s\t%04d%02d%02d\t%s\t%s\t%s\t%s/%s\n",uinfo->id,year,mon,day,hour,ip,url,source,list); + fprintf(fp_ou,"%s\t%04d%02d%02d\t%s\t%s\t%s\t",uinfo->id,year,mon,day,hour,ip,url); + if (source[0] && list[0]) + fprintf(fp_ou,"%s/%s\n",source,list); + else if (source[0]) + fprintf(fp_ou,"%s\n",source); + else + fprintf(fp_ou,"%s\n",list); squidguard_count++; } fclose(fp_in);