Replace redirector_ignore_date by redirector_filter_out_date that behave as the name...

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 36005f691709cdc302d102866ea2d52d47886149..2d36772b9c9542cb7567b80d7e9e90c812d4c37d 100755 (executable)
--- 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 fc39088c8fd39d9d50ea003bce2c717d89d0fdab..6ad69d3e97c253887d4ddef0161ebe914314f17a 100644 (file)
--- 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 7d069d0093b257dd776abbafd0420e16cd2018fb..c6d081b1c7d0d8563fe59bf83ded782832c373d6 100644 (file)
--- 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 f089bafd8722fa9dad996fcc8d12eafc21ef7ec6..ba9519805bd380d12ba91640d63020d7a34fe277 100644 (file)
--- 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 34a70ad2535cbb9583fb06318dd414109eb8e5bf..2d3e88286a80b116b2e7d5ca5c5c80a3613ac49b 100755 (executable)
--- 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 301a1635ab2aa8078e5416952418f5643538edb9..0556a87065fff314dd2d200414bd49daa96df6d5 100755 (executable)
--- 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 f3682193dd0f1d04b49705b3814233c70217e613..d6e61d17e89f1d99fbda20f351c9b0eeff9c9f95 100644 (file)
--- 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 1ec8cc0a1401486302f918b07f5f0f8c65cb76a4..0248aac3aa7b5c07c7560c951774f6e05f720d56 100644 (file)
--- 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 a8a2b833b526f46dc15cde350635036ea9d1d137..33df2629a722aa9eb59d2e5eb1c0380b23e4c9d3 100644 (file)
--- 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 074a0f1a150fefaa5422ceb4cda5ff64598ed646..dd36d1001c2835d82d03a797c61f807bcf2b5845 100644 (file)
--- 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 63bac1e1d5b354f42856dad01cf63eea5b96957d..8c255258d80363cd5970984b4d40836eb83f578a 100644 (file)
--- 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 660518ef4cead913870f2ccc907f49a7db9e3a83..85fd820ab5898d6689e67ea82e9b14b2653b6723 100644 (file)
--- 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 24403daba353c40617bf274e3e984cf534e3e00f..86cea59cdf765a3769733d20c9afd5a402ef348b 100644 (file)
--- 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 be3d86e3202c0bb8ac7fde4f92a566d2f529a80d..9a357230378e2c999da0071b05b261dceb09fd7c 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,10 +6,10 @@
 # Frédéric Marchal <fmarchal@perso.be>, 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 <fmarchal@perso.be>\n"
 "Language-Team: French <traduc@traduc.org>\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 edbbb08e08061a37b2ba701a5e205b928e8b6c76..5af6730147c0beab58676c3d96761f8ce958ab7a 100644 (file)
--- 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 a2f173c463530bea608b982f475b3f8d68a6c66b..483d8e9e2bc8be19d025d2723b049896d2b1c40d 100644 (file)
--- 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 340a14bf5c315f207ca627e194fd5e1a0526657c..0e65c94afdc893786abdcf9208981f9186c9ca89 100644 (file)
--- 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 d90ba9591f67dbfd6d997db54f3f9f4854c16a84..83c92576e97ec4cfb205f18aeb4027cca7915cb3 100644 (file)
--- 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 886d7d91b93f5b6ca418e8790e41c11b248f0454..73ddfbd8d82e155ba53a08d27e9670a4ac15a791 100644 (file)
--- 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 <juris@dc.lv>\n"
 "Language-Team: Latvian <translation-team-lv@lists.sourceforge.net>\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 b28c6e735a5588c6e5078d58b20ba10ebdee6fe3..a52be5286fc9139e6a52ace5108769377e49c223 100644 (file)
--- 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 <erwin.poeze@gmail.com>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\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 150ba1ed39a9ce5120f509d97c8b3bd313d21b86..37754ca11e65098dc6d1ba2d2d0385b57bb91d8f 100644 (file)
--- 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 45a180339bd7e11165390a301a14859a908b353a..fe2e23dab35c402fa800affb53504c510533b733 100644 (file)
--- 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 3fe8ec5a799cbcfe2370f0cb448dc6ebf4d69e8c..b07796d08da1831c0308247440e7ec9c1d4981b0 100644 (file)
--- 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 ef98858e7b0e6f9acf798b914b1a87fd577be089..9f1212ca69c6256996fd0e778aca80818a150dae 100644 (file)
--- 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 <acid@jack.kiev.ua>\n"
 "Language-Team: Russian <gnu@mx.ru>\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 52e0c5fe4612e465b093dd07ff6ec29fd54c7d3e..ca848186c27dd5112963c997597dffd9fd43fadd 100644 (file)
--- 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 887e1d52e501bb0cc7488c91c1d031420f8bbf72..a289ce3846b580d70fa29fedb9d60def830c9960 100644 (file)
--- 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 e69a353a240fc57ce3df8320f63403d37c4d7c7b..bf521dd3a4685a89b9522fdc948f3770259142fc 100644 (file)
--- 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 b70c927b2075d53741072c31f785dce741afa3a4..39371d231b921830fdea963faa46839e738502ab 100644 (file)
--- 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 49448d0ad5b796a196ac1fdd874e59c64c1a9ac9..f85f12c10f1623f831fbcb7b50390934805cd9c3 100644 (file)
--- 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 <kurt998@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\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 e007776990ae6046d54e11cc76a389d9d8b90b4b..9f88cad67541ef658de9f6c98aef11277594610c 100644 (file)
--- 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 4176df07f6ecbd74286c54ab9a3da7ada4be44fe..79262293f0f94a97507d19429c5d7c654f427f2e 100644 (file)
--- 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);