Import 2.6.4

11 files changed, 344 insertions, 287 deletions

diff --git a/debian/README b/debian/README
new file mode 100644
index 0000000..8e9cc52
--- /dev/null
+++ b/debian/README
@@ -0,0 +1,15 @@
+
+Developers and users interested in the future of dctrl-tools
+(grep-dctrl and friends) are encouraged to subscribe to the
+dctrl-tools-devel mailing list at
+  http://lists.alioth.debian.org/mailman/listinfo/dctrl-tools-devel
+
+Early versions are available in the experimental distribution of
+Debian.  Those and also occasional very early preview versions are
+available at
+  deb http://antti-juhani.kaijanaho.info/dctrl-tools-experimental/ ./
+  deb-src http://antti-juhani.kaijanaho.info/dctrl-tools-experimental/ ./
+I would appreciate if all users of these sources subscribed to the
+above mailing list.
+
+ -- Antti-Juhani Kaijanaho <ajk@debian.org>  Sat, 17 Jul 2004 04:31:34 +0300
diff --git a/debian/changelog b/debian/changelog
index 80a0a8d..2968613 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+grep-dctrl (2.6.4) experimental; urgency=low
+
+  * debian/control (Build-Depends): gcc (>= 3.0)
+  * debian/README: New file.
+  * debian/rules: Install debian/README as README.Debian.
+  * grep-dctrl.1.cp: Warn about coming semantics change for
+    numeric comparisons.  
+  * grep-dctrl.c: Add warning about coming semantics change for
+    numeric comparisons. 
+
+ -- Antti-Juhani Kaijanaho <ajk@debian.org>  Sat, 17 Jul 2004 04:44:40 +0300
+
 grep-dctrl (2.6.3) experimental; urgency=low
 
   * sync-available.cp, Makefile: Fix the goofup which made sync-available
diff --git a/debian/control b/debian/control
index 991dfa5..0d1c501 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: utils
 Priority: optional
 Maintainer: Antti-Juhani Kaijanaho <ajk@debian.org>
 Standards-Version: 3.6.1
-Build-Depends: gettext (>= 0.11-0), libgmp3-dev
+Build-Depends: gettext (>= 0.11-0), libgmp3-dev, gcc (>= 3.0)
 
 Package: grep-dctrl
 Architecture: any
diff --git a/debian/rules b/debian/rules
index ff7ea03..29fdf76 100644
--- a/debian/rules
+++ b/debian/rules
@@ -52,6 +52,7 @@ debian/stamp/binary/grep-dctrl: debian/stamp/build
 	 done
 #	Install the supporting documentation.
 	$(install_nonex) TODO Compatibility $(docdir)
+	$(install_nonex) debian/README $(docdir)/README.Debian
 #	Install message catalogues
 	set -e ; for lang in $(langs) ; do \
 		$(install_dir) $(rootdir)/usr/share/locale/$$lang/LC_MESSAGES ; \
diff --git a/grep-dctrl.1.cp b/grep-dctrl.1.cp
index 8a3d065..478f3f5 100644
--- a/grep-dctrl.1.cp
+++ b/grep-dctrl.1.cp
@@ -1,4 +1,4 @@
-.TH GREP-DCTRL 1 2004-01-19 "Debian Project" "Debian user's manual"
+.TH GREP-DCTRL 1 2004-07-17 "Debian Project" "Debian user's manual"
 \" Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
 \"               Antti-Juhani Kaijanaho <gaia@iki.fi>
 \"      This program is free software; you can redistribute it and/or modify
@@ -141,30 +141,35 @@ literal.  Any paragraphs where the field to be searched in does not
 parse as an integer literal are regarded as not matching.  Note that
 using numeric comparison when looking at full paragraphs does not make
 sense.
+.B WARNING!  The semantics of numeric comparison will change in the future.
 .IP "--lt"
 Use numeric strictly-less-than comparison in matching.  The pattern
 must be an integer literal.  Any paragraphs where the field to be
 searched in does not parse as an integer literal are regarded as not
 matching.  Note that using numeric comparison when looking at full
 paragraphs does not make sense.
+.B WARNING!  The semantics of numeric comparison will change in the future.
 .IP "--le"
 Use numeric less-than-or-equal comparison in matching.  The pattern
 must be an integer literal.  Any paragraphs where the field to be
 searched in does not parse as an integer literal are regarded as not
 matching.  Note that using numeric comparison when looking at full
 paragraphs does not make sense.
+.B WARNING!  The semantics of numeric comparison will change in the future.
 .IP "--gt"
 Use numeric strictly-greater-than comparison in matching.  The pattern
 must be an integer literal.  Any paragraphs where the field to be
 searched in does not parse as an integer literal are regarded as not
 matching.  Note that using numeric comparison when looking at full
 paragraphs does not make sense.
+.B WARNING!  The semantics of numeric comparison will change in the future.
 .IP "--ge"
 Use numeric greater-than-or-equal comparison in matching.  The pattern
 must be an integer literal.  Any paragraphs where the field to be
 searched in does not parse as an integer literal are regarded as not
 matching.  Note that using numeric comparison when looking at full
 paragraphs does not make sense.
+.B WARNING!  The semantics of numeric comparison will change in the future.
 .SS Predicate connectives
 .IP "-!, --not, !"
 Negate the following predicate.
diff --git a/grep-dctrl.c b/grep-dctrl.c
index e9979c3..413abdc 100644
--- a/grep-dctrl.c
+++ b/grep-dctrl.c
@@ -53,6 +53,10 @@ static char progdoc [] = N_("grep-dctrl -- grep Debian control files");
 #define OPT_GT 262
 #define OPT_GE 263
 
+static bool num_comp_warning_shown = false;
+static char const num_comp_warning [] = 
+"%s: WARNING: the semantics of numeric comparison will change in the future\n";
+
 #undef BANNER
 
 #ifdef BANNER
@@ -458,22 +462,42 @@ static error_t parse_opt (int key, char * arg, struct argp_state * state)
 	case OPT_EQ:
 		debug_message("parse_opt: eq", 0);
 		set_mode(M_NUM_EQ);
+		if (!num_comp_warning_shown && do_msg(L_IMPORTANT)) {
+			fprintf(stderr, num_comp_warning, get_progname());
+			num_comp_warning_shown = true;
+		}
 		break;
 	case OPT_LT:
 		debug_message("parse_opt: lt", 0);
 		set_mode(M_NUM_LT);
+		if (!num_comp_warning_shown && do_msg(L_IMPORTANT)) {
+			fprintf(stderr, num_comp_warning, get_progname());
+			num_comp_warning_shown = true;
+		}
 		break;
 	case OPT_LE:
 		debug_message("parse_opt: le", 0);
 		set_mode(M_NUM_LE);
+		if (!num_comp_warning_shown && do_msg(L_IMPORTANT)) {
+			fprintf(stderr, num_comp_warning, get_progname());
+			num_comp_warning_shown = true;
+		}
 		break;
 	case OPT_GT:
 		debug_message("parse_opt: gt", 0);
 		set_mode(M_NUM_GT);
+		if (!num_comp_warning_shown && do_msg(L_IMPORTANT)) {
+			fprintf(stderr, num_comp_warning, get_progname());
+			num_comp_warning_shown = true;
+		}
 		break;
 	case OPT_GE:
 		debug_message("parse_opt: ge", 0);
 		set_mode(M_NUM_GE);
+		if (!num_comp_warning_shown && do_msg(L_IMPORTANT)) {
+			fprintf(stderr, num_comp_warning, get_progname());
+			num_comp_warning_shown = true;
+		}
 		break;
 	case 'i':
 		debug_message("parse_opt: i", 0);
diff --git a/po/ca.po b/po/ca.po
index f2017c0..489bc42 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dctrl-tools\n"
 "Report-Msgid-Bugs-To: ajk@debian.org\n"
-"POT-Creation-Date: 2004-07-12 17:51+0300\n"
+"POT-Creation-Date: 2004-07-17 04:42+0300\n"
 "PO-Revision-Date: 2004-02-09 10:16+0100\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -19,37 +19,37 @@ msgstr ""
 msgid "grep-dctrl -- grep Debian control files"
 msgstr "grep-dctrl -- cerca patrons en fitxers de control de Debian"
 
-#: grep-dctrl.c:101
+#: grep-dctrl.c:105
 msgid "Show the testing banner."
 msgstr "Mostra l'avís de prova."
 
-#: grep-dctrl.c:103
+#: grep-dctrl.c:107
 msgid "LEVEL"
 msgstr "NIVELL"
 
-#: grep-dctrl.c:103
+#: grep-dctrl.c:107
 msgid "Set debugging level to LEVEL."
 msgstr "Estableix el nivell de depuració a NIVELL."
 
-#: grep-dctrl.c:104 grep-dctrl.c:106
+#: grep-dctrl.c:108 grep-dctrl.c:110
 msgid "FIELD,FIELD,..."
 msgstr "CAMP,CAMP,..."
 
-#: grep-dctrl.c:104
+#: grep-dctrl.c:108
 #, fuzzy
 msgid "Restrict pattern matching to the FIELDs given."
 msgstr "Restringeix la coincidència de patrons als CAMPs donats."
 
-#: grep-dctrl.c:105
+#: grep-dctrl.c:109
 #, fuzzy
 msgid "This is a shorthand for -FPackage."
 msgstr "Forma curta per a -FPackage"
 
-#: grep-dctrl.c:106
+#: grep-dctrl.c:110
 msgid "Show only the body of these fields from the matching paragraphs."
 msgstr "Mostra només el cos d'aquests camps dels paràgrafs coincidents."
 
-#: grep-dctrl.c:107
+#: grep-dctrl.c:111
 msgid ""
 "Show only the first line of the \"Description\" field from the matching "
 "paragraphs."
@@ -57,210 +57,210 @@ msgstr ""
 "Mostra només la primera línia del camp «Description» dels paràgrafs "
 "coincidents."
 
-#: grep-dctrl.c:108
+#: grep-dctrl.c:112
 msgid "Suppress field names when showing specified fields."
 msgstr "Suprimeix els noms dels camps quan mostra els camps especificats."
 
-#: grep-dctrl.c:109
+#: grep-dctrl.c:113
 msgid "Regard the pattern as an extended POSIX regular expression."
 msgstr "Considera el patró com una expressió regular estesa POSIX."
 
-#: grep-dctrl.c:110
+#: grep-dctrl.c:114
 msgid "The pattern is a standard POSIX regular expression."
 msgstr "El patró és una expressió regular estàndard POSIX."
 
-#: grep-dctrl.c:111
+#: grep-dctrl.c:115
 msgid "Ignore case when looking for a match."
 msgstr ""
 "No distigueixes entre majúscules i minúscules quan cerca una coincidència."
 
-#: grep-dctrl.c:112
+#: grep-dctrl.c:116
 msgid "Show only paragraphs that do not match."
 msgstr "Mostra només els paràgrafs que no coincideixen."
 
-#: grep-dctrl.c:113
+#: grep-dctrl.c:117
 msgid "Show only the count of matching paragraphs."
 msgstr "Mostra només el compte de paràgrafs coincidents."
 
-#: grep-dctrl.c:114
+#: grep-dctrl.c:118
 msgid "FNAME"
 msgstr "NOMFITXER"
 
-#: grep-dctrl.c:114
+#: grep-dctrl.c:118
 msgid "Use FNAME as the config file."
 msgstr "Utilitza NOMFITXER com el fitxer de configuració."
 
-#: grep-dctrl.c:115
+#: grep-dctrl.c:119
 msgid "Do an exact match."
 msgstr "Fes una coincidència exacta."
 
-#: grep-dctrl.c:116
+#: grep-dctrl.c:120
 msgid "Print out the copyright license."
 msgstr "Mostra la llicència del copyright."
 
-#: grep-dctrl.c:117
+#: grep-dctrl.c:121
 msgid "Conjunct predicates."
 msgstr "Predicats conjunts."
 
-#: grep-dctrl.c:118
+#: grep-dctrl.c:122
 msgid "Disjunct predicates."
 msgstr "Predicats disjunts."
 
-#: grep-dctrl.c:119
+#: grep-dctrl.c:123
 msgid "Negate the following predicate."
 msgstr "Nega el següent predicat."
 
-#: grep-dctrl.c:120
+#: grep-dctrl.c:124
 msgid "Test for numerical equality."
 msgstr "Comprova l'igualtat numèrica."
 
-#: grep-dctrl.c:121
+#: grep-dctrl.c:125
 msgid "Numerical test: <."
 msgstr "Comprovació numèrica: <."
 
-#: grep-dctrl.c:122
+#: grep-dctrl.c:126
 msgid "Numerical test: <=."
 msgstr "Comprovació numèrica: <=."
 
-#: grep-dctrl.c:123
+#: grep-dctrl.c:127
 msgid "Numerical test: >."
 msgstr "Comprovació numèrica: >."
 
-#: grep-dctrl.c:124
+#: grep-dctrl.c:128
 msgid "Numerical test: >=."
 msgstr "Comprovació numèrica: >=."
 
-#: grep-dctrl.c:125
+#: grep-dctrl.c:129
 msgid "Debug option parsing."
 msgstr "Depura l'anàlisi d'opcions."
 
-#: grep-dctrl.c:126 grep-dctrl.c:127
+#: grep-dctrl.c:130 grep-dctrl.c:131
 #, fuzzy
 msgid "Do no output to stdout."
 msgstr "No mostra res a l'eixida estàndard"
 
-#: grep-dctrl.c:205 grep-dctrl.c:318 predicate.c:41
+#: grep-dctrl.c:209 grep-dctrl.c:322 predicate.c:41
 msgid "predicate is too complex"
 msgstr "el predicat és massa complex"
 
-#: grep-dctrl.c:286
+#: grep-dctrl.c:290
 #, fuzzy
 msgid "predicate is too long"
 msgstr "el predicat és massa complex"
 
-#: grep-dctrl.c:343
+#: grep-dctrl.c:347
 msgid "inconsistent atom modifiers"
 msgstr "els modificadors d'àtom no són consistents"
 
-#: grep-dctrl.c:410
+#: grep-dctrl.c:414
 msgid "no such log level"
 msgstr "aquest nivell de registre no existeix"
 
-#: grep-dctrl.c:510
+#: grep-dctrl.c:534
 msgid "too many file names"
 msgstr "hi ha massa noms de fitxers"
 
-#: grep-dctrl.c:591
+#: grep-dctrl.c:615
 #, c-format
 msgid "%s: command (%s) failed (exit status %d)\n"
 msgstr "%s: l'ordre (%s) ha fallat (estat d'eixida %d)\n"
 
-#: grep-dctrl.c:600
+#: grep-dctrl.c:624
 #, c-format
 msgid "%s: command (%s) was killed by signal %d\n"
 msgstr "%s: l'ordre (%s) ha estat terminada pel senyal %d\n"
 
-#: grep-dctrl.c:638
+#: grep-dctrl.c:662
 #, c-format
 msgid "%s (child): failed to exec /bin/sh: %s\n"
 msgstr "%s (fill): no s'ha pogut executar /bin/sh: %s\n"
 
-#: grep-dctrl.c:692
+#: grep-dctrl.c:716
 #, fuzzy
 msgid "unexpected end of predicate"
 msgstr "s'ha trobat un final de fitxer inesperat"
 
-#: grep-dctrl.c:695
+#: grep-dctrl.c:719
 #, fuzzy
 msgid "unexpected '!' in command line"
 msgstr "s'ha trobat un «)» inesperat a la línia d'ordres"
 
-#: grep-dctrl.c:698
+#: grep-dctrl.c:722
 #, fuzzy
 msgid "unexpected '-a' in command line"
 msgstr "s'ha trobat un «)» inesperat a la línia d'ordres"
 
-#: grep-dctrl.c:701
+#: grep-dctrl.c:725
 #, fuzzy
 msgid "unexpected '-o' in command line"
 msgstr "s'ha trobat un «)» inesperat a la línia d'ordres"
 
-#: grep-dctrl.c:704
+#: grep-dctrl.c:728
 #, fuzzy
 msgid "unexpected '(' in command line"
 msgstr "s'ha trobat un «)» inesperat a la línia d'ordres"
 
-#: grep-dctrl.c:707
+#: grep-dctrl.c:731
 msgid "unexpected ')' in command line"
 msgstr "s'ha trobat un «)» inesperat a la línia d'ordres"
 
-#: grep-dctrl.c:711
+#: grep-dctrl.c:735
 #, fuzzy
 msgid "unexpected atom in command line"
 msgstr "s'ha trobat un «)» inesperat a la línia d'ordres"
 
-#: grep-dctrl.c:724
+#: grep-dctrl.c:748
 msgid "missing ')' in command line"
 msgstr "manca un «)» en la línia d'ordres"
 
-#: grep-dctrl.c:796
+#: grep-dctrl.c:820
 #, fuzzy
 msgid "A pattern is mandatory"
 msgstr "Es necessita un patró."
 
-#: grep-dctrl.c:803
+#: grep-dctrl.c:827
 msgid "a predicate is required"
 msgstr "es requereix un predicat"
 
-#: grep-dctrl.c:808
+#: grep-dctrl.c:832
 msgid "malformed predicate"
 msgstr ""
 
-#: grep-dctrl.c:814
+#: grep-dctrl.c:838
 msgid "too many output fields"
 msgstr "hi ha massa camps d'eixida"
 
-#: grep-dctrl.c:818
+#: grep-dctrl.c:842
 msgid "Adding \"Description\" to selected output fields because of -d"
 msgstr ""
 "S'està afegint «Description» als camps d'eixida seleccionats a causa de -d"
 
-#: grep-dctrl.c:827
+#: grep-dctrl.c:851
 msgid "cannot suppress field names when showing whole paragraphs"
 msgstr "no es pot suprimir els noms de camp quan es mostren paràgrafs sencers"
 
-#: grep-dctrl.c:861
+#: grep-dctrl.c:885
 #, c-format
 msgid "%s: %s: cannot stat: %s\n"
 msgstr "%s: %s: no es pot fer stat(): %s\n"
 
-#: grep-dctrl.c:870
+#: grep-dctrl.c:894
 msgid "is a directory, skipping"
 msgstr "és un directori, s'està ometent"
 
-#: grep-dctrl.c:871
+#: grep-dctrl.c:895
 msgid "is a block device, skipping"
 msgstr "és un dispositiu de bloc, s'està ometent"
 
-#: grep-dctrl.c:872
+#: grep-dctrl.c:896
 msgid "internal error"
 msgstr "s'ha produït un error intern"
 
-#: grep-dctrl.c:873
+#: grep-dctrl.c:897
 msgid "is a socket, skipping"
 msgstr "és un sòcol, s'està ometent"
 
-#: grep-dctrl.c:874
+#: grep-dctrl.c:898
 msgid "unknown file type, skipping"
 msgstr "el tipus de fitxer és desconegut, s'està ometent"
 
diff --git a/po/de.po b/po/de.po
index 126df99..dd4f94b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dctrl-tools\n"
 "Report-Msgid-Bugs-To: ajk@debian.org\n"
-"POT-Creation-Date: 2004-07-12 17:51+0300\n"
+"POT-Creation-Date: 2004-07-17 04:42+0300\n"
 "PO-Revision-Date: 2004-07-05 13:41+0200\n"
 "Last-Translator: Gerfried Fuchs <alfie@debian.org>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -19,235 +19,235 @@ msgstr ""
 msgid "grep-dctrl -- grep Debian control files"
 msgstr "grep-dctrl -- grep Debian-Control-Dateien"
 
-#: grep-dctrl.c:101
+#: grep-dctrl.c:105
 msgid "Show the testing banner."
 msgstr "Zeigt den Testing-Banner."
 
-#: grep-dctrl.c:103
+#: grep-dctrl.c:107
 msgid "LEVEL"
 msgstr "EBENE"
 
-#: grep-dctrl.c:103
+#: grep-dctrl.c:107
 msgid "Set debugging level to LEVEL."
 msgstr "Setzt Debugging-Ebene auf EBENE."
 
-#: grep-dctrl.c:104 grep-dctrl.c:106
+#: grep-dctrl.c:108 grep-dctrl.c:110
 msgid "FIELD,FIELD,..."
 msgstr "FELD,FELD,..."
 
-#: grep-dctrl.c:104
+#: grep-dctrl.c:108
 msgid "Restrict pattern matching to the FIELDs given."
 msgstr "Beschränkt die Musterprüfung auf die angegebenen FELDer."
 
-#: grep-dctrl.c:105
+#: grep-dctrl.c:109
 msgid "This is a shorthand for -FPackage."
 msgstr "Dies ist eine Kurzform für -FPackage."
 
-#: grep-dctrl.c:106
+#: grep-dctrl.c:110
 msgid "Show only the body of these fields from the matching paragraphs."
 msgstr "Zeigt nur den Inhalt dieser Felder aus dem passenden Abschnitt."
 
-#: grep-dctrl.c:107
+#: grep-dctrl.c:111
 msgid ""
 "Show only the first line of the \"Description\" field from the matching "
 "paragraphs."
 msgstr ""
 "Zeigt nur die erste Zeile des »Description«-Feldes des passenden Abschnitts."
 
-#: grep-dctrl.c:108
+#: grep-dctrl.c:112
 msgid "Suppress field names when showing specified fields."
 msgstr "Unterdrückt die Feldnamen beim Anzeigen der angegebenen Felder."
 
-#: grep-dctrl.c:109
+#: grep-dctrl.c:113
 msgid "Regard the pattern as an extended POSIX regular expression."
 msgstr "Behandelt das Muster als erweiterten POSIX-regulären Ausdruck."
 
-#: grep-dctrl.c:110
+#: grep-dctrl.c:114
 msgid "The pattern is a standard POSIX regular expression."
 msgstr "Das Muster ist ein Standard-POSIX regulärer Ausdruck."
 
-#: grep-dctrl.c:111
+#: grep-dctrl.c:115
 msgid "Ignore case when looking for a match."
 msgstr "Ignoriert die Groß-/Kleinschreibung beim Suchen eines Treffers."
 
-#: grep-dctrl.c:112
+#: grep-dctrl.c:116
 msgid "Show only paragraphs that do not match."
 msgstr "Zeigt nur die Abschnitte, die nicht passen."
 
-#: grep-dctrl.c:113
+#: grep-dctrl.c:117
 msgid "Show only the count of matching paragraphs."
 msgstr "Zeigt nur die Anzahl der passenden Abschnitte."
 
-#: grep-dctrl.c:114
+#: grep-dctrl.c:118
 msgid "FNAME"
 msgstr "FNAME"
 
-#: grep-dctrl.c:114
+#: grep-dctrl.c:118
 msgid "Use FNAME as the config file."
 msgstr "Verwendet FNAME als Konfigurationsdatei."
 
-#: grep-dctrl.c:115
+#: grep-dctrl.c:119
 msgid "Do an exact match."
 msgstr "Führt eine exakte Übereinstimmung durch."
 
-#: grep-dctrl.c:116
+#: grep-dctrl.c:120
 msgid "Print out the copyright license."
 msgstr "Gibt die Copyright-Lizenz aus."
 
-#: grep-dctrl.c:117
+#: grep-dctrl.c:121
 msgid "Conjunct predicates."
 msgstr "UND-verknüpfte Eigenschaften."
 
-#: grep-dctrl.c:118
+#: grep-dctrl.c:122
 msgid "Disjunct predicates."
 msgstr "ODER-verknüpfte Eigenschaften."
 
-#: grep-dctrl.c:119
+#: grep-dctrl.c:123
 msgid "Negate the following predicate."
 msgstr "Negiert die folgende Eigenschaft."
 
-#: grep-dctrl.c:120
+#: grep-dctrl.c:124
 msgid "Test for numerical equality."
 msgstr "Test auf numerische Ãœbereinstimmung."
 
-#: grep-dctrl.c:121
+#: grep-dctrl.c:125
 msgid "Numerical test: <."
 msgstr "Numerischer Test: <."
 
-#: grep-dctrl.c:122
+#: grep-dctrl.c:126
 msgid "Numerical test: <=."
 msgstr "Numerischer Test: <=."
 
-#: grep-dctrl.c:123
+#: grep-dctrl.c:127
 msgid "Numerical test: >."
 msgstr "Numerischer Test: >."
 
-#: grep-dctrl.c:124
+#: grep-dctrl.c:128
 msgid "Numerical test: >=."
 msgstr "Numerischer Test: >=."
 
-#: grep-dctrl.c:125
+#: grep-dctrl.c:129
 msgid "Debug option parsing."
 msgstr "Optionenverarbeitung debuggen."
 
-#: grep-dctrl.c:126 grep-dctrl.c:127
+#: grep-dctrl.c:130 grep-dctrl.c:131
 msgid "Do no output to stdout."
 msgstr "Keine Ausgabe auf die Standardausgabe."
 
-#: grep-dctrl.c:205 grep-dctrl.c:318 predicate.c:41
+#: grep-dctrl.c:209 grep-dctrl.c:322 predicate.c:41
 msgid "predicate is too complex"
 msgstr "Eigenschaft ist zu komplex"
 
-#: grep-dctrl.c:286
+#: grep-dctrl.c:290
 msgid "predicate is too long"
 msgstr "Eigenschaft ist zu lang"
 
-#: grep-dctrl.c:343
+#: grep-dctrl.c:347
 msgid "inconsistent atom modifiers"
 msgstr "Inkonsistener Atom-Modifikator"
 
-#: grep-dctrl.c:410
+#: grep-dctrl.c:414
 msgid "no such log level"
 msgstr "Keine solche Log-Ebene"
 
-#: grep-dctrl.c:510
+#: grep-dctrl.c:534
 msgid "too many file names"
 msgstr "Zu viele Dateinamen"
 
-#: grep-dctrl.c:591
+#: grep-dctrl.c:615
 #, c-format
 msgid "%s: command (%s) failed (exit status %d)\n"
 msgstr "%s: Befehl (%s) fehlgeschlagen (Rückgabewert %d)\n"
 
-#: grep-dctrl.c:600
+#: grep-dctrl.c:624
 #, c-format
 msgid "%s: command (%s) was killed by signal %d\n"
 msgstr "%s: Befehl (%s) wurde von Signal %d abgebrochen\n"
 
-#: grep-dctrl.c:638
+#: grep-dctrl.c:662
 #, c-format
 msgid "%s (child): failed to exec /bin/sh: %s\n"
 msgstr "%s (Kindprozess): Konnte /bin/sh nicht ausführen: %s\n"
 
-#: grep-dctrl.c:692
+#: grep-dctrl.c:716
 msgid "unexpected end of predicate"
 msgstr "unerwartetes Eigenschaftsende"
 
-#: grep-dctrl.c:695
+#: grep-dctrl.c:719
 msgid "unexpected '!' in command line"
 msgstr "Unerwartetes »!« in der Befehlszeile"
 
-#: grep-dctrl.c:698
+#: grep-dctrl.c:722
 msgid "unexpected '-a' in command line"
 msgstr "Unerwartetes »-a« in der Befehlszeile"
 
-#: grep-dctrl.c:701
+#: grep-dctrl.c:725
 msgid "unexpected '-o' in command line"
 msgstr "Unerwartetes »-o« in der Befehlszeile"
 
-#: grep-dctrl.c:704
+#: grep-dctrl.c:728
 msgid "unexpected '(' in command line"
 msgstr "Unerwartete »(« in der Befehlszeile"
 
-#: grep-dctrl.c:707
+#: grep-dctrl.c:731
 msgid "unexpected ')' in command line"
 msgstr "Unerwartete »)« in der Befehlszeile"
 
-#: grep-dctrl.c:711
+#: grep-dctrl.c:735
 msgid "unexpected atom in command line"
 msgstr "Unerwartetes Atom in der Befehlszeile"
 
-#: grep-dctrl.c:724
+#: grep-dctrl.c:748
 msgid "missing ')' in command line"
 msgstr "Fehlende »)« in der Befehlszeile"
 
-#: grep-dctrl.c:796
+#: grep-dctrl.c:820
 msgid "A pattern is mandatory"
 msgstr "Ein Muster wird benötigt"
 
-#: grep-dctrl.c:803
+#: grep-dctrl.c:827
 msgid "a predicate is required"
 msgstr "Eine Eigenschaft wird benötigt"
 
-#: grep-dctrl.c:808
+#: grep-dctrl.c:832
 msgid "malformed predicate"
 msgstr "Missgebildete Eigenschaft"
 
-#: grep-dctrl.c:814
+#: grep-dctrl.c:838
 msgid "too many output fields"
 msgstr "Zu viele Ausgabefelder"
 
-#: grep-dctrl.c:818
+#: grep-dctrl.c:842
 msgid "Adding \"Description\" to selected output fields because of -d"
 msgstr "Füge »Description« wegen -d zu den gewählten Ausgabefeldern hinzu"
 
-#: grep-dctrl.c:827
+#: grep-dctrl.c:851
 msgid "cannot suppress field names when showing whole paragraphs"
 msgstr ""
 "Kann keine Feldnamen unterdrücken, wenn komplette Abschnitte angezeigt werden"
 
-#: grep-dctrl.c:861
+#: grep-dctrl.c:885
 #, c-format
 msgid "%s: %s: cannot stat: %s\n"
 msgstr "%s: %s: stat kann nicht durchgeführt werden: %s\n"
 
-#: grep-dctrl.c:870
+#: grep-dctrl.c:894
 msgid "is a directory, skipping"
 msgstr "ist ein Verzeichnis, wird übersprungen"
 
-#: grep-dctrl.c:871
+#: grep-dctrl.c:895
 msgid "is a block device, skipping"
 msgstr "ist ein Block-Gerät, wird übersprungen"
 
-#: grep-dctrl.c:872
+#: grep-dctrl.c:896
 msgid "internal error"
 msgstr "interner Fehler"
 
-#: grep-dctrl.c:873
+#: grep-dctrl.c:897
 msgid "is a socket, skipping"
 msgstr "ist ein Socket, wird übersprungen"
 
-#: grep-dctrl.c:874
+#: grep-dctrl.c:898
 msgid "unknown file type, skipping"
 msgstr "unbekannter Dateityp, wird übersprungen"
 
diff --git a/po/fi.po b/po/fi.po
index 500a1f6..f7116e6 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dctrl-tools\n"
 "Report-Msgid-Bugs-To: ajk@debian.org\n"
-"POT-Creation-Date: 2004-07-12 17:51+0300\n"
+"POT-Creation-Date: 2004-07-17 04:42+0300\n"
 "PO-Revision-Date: 2004-07-08 18:29+0300\n"
 "Last-Translator: Antti-Juhani Kaijanaho <ajk@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -19,235 +19,235 @@ msgstr ""
 msgid "grep-dctrl -- grep Debian control files"
 msgstr "grep-dctrl -- hae Debianin kontrollitiedostoista"
 
-#: grep-dctrl.c:101
+#: grep-dctrl.c:105
 msgid "Show the testing banner."
 msgstr "Näytä testausviesti."
 
-#: grep-dctrl.c:103
+#: grep-dctrl.c:107
 msgid "LEVEL"
 msgstr "TASO"
 
-#: grep-dctrl.c:103
+#: grep-dctrl.c:107
 msgid "Set debugging level to LEVEL."
 msgstr "Aseta vianetsintätasoksi TASO."
 
-#: grep-dctrl.c:104 grep-dctrl.c:106
+#: grep-dctrl.c:108 grep-dctrl.c:110
 msgid "FIELD,FIELD,..."
 msgstr "KENTTÄ,KENTT�,..."
 
-#: grep-dctrl.c:104
+#: grep-dctrl.c:108
 msgid "Restrict pattern matching to the FIELDs given."
 msgstr "Rajoita haku annettuihin KENTTIIN."
 
-#: grep-dctrl.c:105
+#: grep-dctrl.c:109
 msgid "This is a shorthand for -FPackage."
 msgstr "Lyhyt muoto vivulle -FPackage"
 
-#: grep-dctrl.c:106
+#: grep-dctrl.c:110
 msgid "Show only the body of these fields from the matching paragraphs."
 msgstr "Näytä vain näiden kenttien sisältö täsmäävissä tietueissa"
 
-#: grep-dctrl.c:107
+#: grep-dctrl.c:111
 msgid ""
 "Show only the first line of the \"Description\" field from the matching "
 "paragraphs."
 msgstr ""
 "Näytä täsmäävien tietueiden \"Description\"-kentästä vain ensimmäinen rivi."
 
-#: grep-dctrl.c:108
+#: grep-dctrl.c:112
 msgid "Suppress field names when showing specified fields."
 msgstr "Älä näytä kenttien nimiä silloin kun haetaan vain tietyistä kentistä."
 
-#: grep-dctrl.c:109
+#: grep-dctrl.c:113
 msgid "Regard the pattern as an extended POSIX regular expression."
 msgstr "Käsittele hakuehtoa laajennettuna POSIXin siäännöllisenä lausekkeena."
 
-#: grep-dctrl.c:110
+#: grep-dctrl.c:114
 msgid "The pattern is a standard POSIX regular expression."
 msgstr "Hakuehto on tavallinen POSIXin säännöllinen lauseke."
 
-#: grep-dctrl.c:111
+#: grep-dctrl.c:115
 msgid "Ignore case when looking for a match."
 msgstr "Jätä kirjainkoko huomiotta haussa."
 
-#: grep-dctrl.c:112
+#: grep-dctrl.c:116
 msgid "Show only paragraphs that do not match."
 msgstr "Näytä vain ne tietueet, jotka eivät täsmää."
 
-#: grep-dctrl.c:113
+#: grep-dctrl.c:117
 msgid "Show only the count of matching paragraphs."
 msgstr "Näytä vain täsmäävien tietueiden lukumäärä."
 
-#: grep-dctrl.c:114
+#: grep-dctrl.c:118
 msgid "FNAME"
 msgstr "TIEDNIMI"
 
-#: grep-dctrl.c:114
+#: grep-dctrl.c:118
 msgid "Use FNAME as the config file."
 msgstr "Käytä TIEDNIMI-tiedostoa asetustiedostona."
 
-#: grep-dctrl.c:115
+#: grep-dctrl.c:119
 msgid "Do an exact match."
 msgstr "Käytä täsmällistä hakua."
 
-#: grep-dctrl.c:116
+#: grep-dctrl.c:120
 msgid "Print out the copyright license."
 msgstr "Tulosta tekijänoikeuslisenssi."
 
-#: grep-dctrl.c:117
+#: grep-dctrl.c:121
 msgid "Conjunct predicates."
 msgstr "Yhdistä predikaatit JA-konnektiivilla"
 
-#: grep-dctrl.c:118
+#: grep-dctrl.c:122
 msgid "Disjunct predicates."
 msgstr "Yhdistä predikaatit TAI-konnektiivilla"
 
-#: grep-dctrl.c:119
+#: grep-dctrl.c:123
 msgid "Negate the following predicate."
 msgstr "Negatoi seuraava predikaatti."
 
-#: grep-dctrl.c:120
+#: grep-dctrl.c:124
 msgid "Test for numerical equality."
 msgstr "Testaa numeerista yhtäsuuruutta."
 
-#: grep-dctrl.c:121
+#: grep-dctrl.c:125
 msgid "Numerical test: <."
 msgstr "Numeerinen testi: <."
 
-#: grep-dctrl.c:122
+#: grep-dctrl.c:126
 msgid "Numerical test: <=."
 msgstr "Numeerinen testi: <=."
 
-#: grep-dctrl.c:123
+#: grep-dctrl.c:127
 msgid "Numerical test: >."
 msgstr "Numeerinen testi: >."
 
-#: grep-dctrl.c:124
+#: grep-dctrl.c:128
 msgid "Numerical test: >=."
 msgstr "Numeerinen testi: >=."
 
-#: grep-dctrl.c:125
+#: grep-dctrl.c:129
 msgid "Debug option parsing."
 msgstr "Testaa valitsimien jäsennyst�."
 
-#: grep-dctrl.c:126 grep-dctrl.c:127
+#: grep-dctrl.c:130 grep-dctrl.c:131
 msgid "Do no output to stdout."
 msgstr "Älä tulosta mitään vakiotulostevirtaan"
 
-#: grep-dctrl.c:205 grep-dctrl.c:318 predicate.c:41
+#: grep-dctrl.c:209 grep-dctrl.c:322 predicate.c:41
 msgid "predicate is too complex"
 msgstr "predikaatti on liian monimutkainen"
 
-#: grep-dctrl.c:286
+#: grep-dctrl.c:290
 msgid "predicate is too long"
 msgstr "predikaatti on liian pitkä"
 
-#: grep-dctrl.c:343
+#: grep-dctrl.c:347
 msgid "inconsistent atom modifiers"
 msgstr "ristitiitaiset atomin määritteet"
 
-#: grep-dctrl.c:410
+#: grep-dctrl.c:414
 msgid "no such log level"
 msgstr "ei sellaista seurantatasoa ole"
 
-#: grep-dctrl.c:510
+#: grep-dctrl.c:534
 msgid "too many file names"
 msgstr "liikaa tiedostonimiä"
 
-#: grep-dctrl.c:591
+#: grep-dctrl.c:615
 #, c-format
 msgid "%s: command (%s) failed (exit status %d)\n"
 msgstr "%s: komento (%s) epäonnistui (lopetuskoodi %d)\n"
 
-#: grep-dctrl.c:600
+#: grep-dctrl.c:624
 #, c-format
 msgid "%s: command (%s) was killed by signal %d\n"
 msgstr "%s: komento (%s) kuoli signaalin %d vuoksi\n"
 
-#: grep-dctrl.c:638
+#: grep-dctrl.c:662
 #, c-format
 msgid "%s (child): failed to exec /bin/sh: %s\n"
 msgstr "%s (lapsi): /bin/sh ei käynnistynyt: %s\n"
 
-#: grep-dctrl.c:692
+#: grep-dctrl.c:716
 msgid "unexpected end of predicate"
 msgstr "odottamaton predikaatin loppu"
 
-#: grep-dctrl.c:695
+#: grep-dctrl.c:719
 msgid "unexpected '!' in command line"
 msgstr "odottamaton '!' komentorivillä"
 
-#: grep-dctrl.c:698
+#: grep-dctrl.c:722
 msgid "unexpected '-a' in command line"
 msgstr "odottamaton '-a' komentorivill�"
 
-#: grep-dctrl.c:701
+#: grep-dctrl.c:725
 msgid "unexpected '-o' in command line"
 msgstr "odottamaton '-o' komentorivill�"
 
-#: grep-dctrl.c:704
+#: grep-dctrl.c:728
 msgid "unexpected '(' in command line"
 msgstr "odottamaton '(' komentorivill�"
 
-#: grep-dctrl.c:707
+#: grep-dctrl.c:731
 msgid "unexpected ')' in command line"
 msgstr "odottamaton ')' komentorivill�"
 
-#: grep-dctrl.c:711
+#: grep-dctrl.c:735
 msgid "unexpected atom in command line"
 msgstr "odottamaton atomi komentorivill�"
 
-#: grep-dctrl.c:724
+#: grep-dctrl.c:748
 msgid "missing ')' in command line"
 msgstr "komentoriviltä puuttuu ')'"
 
-#: grep-dctrl.c:796
+#: grep-dctrl.c:820
 msgid "A pattern is mandatory"
 msgstr "Hakuehto on välttämätön."
 
-#: grep-dctrl.c:803
+#: grep-dctrl.c:827
 msgid "a predicate is required"
 msgstr "predikaatti on välttämätön"
 
-#: grep-dctrl.c:808
+#: grep-dctrl.c:832
 msgid "malformed predicate"
 msgstr "rikkinäinen predikaatti"
 
-#: grep-dctrl.c:814
+#: grep-dctrl.c:838
 msgid "too many output fields"
 msgstr "liikaa tulostettavia kenttiä"
 
-#: grep-dctrl.c:818
+#: grep-dctrl.c:842
 msgid "Adding \"Description\" to selected output fields because of -d"
 msgstr "Merkitsen \"Description\"-kentän tulostettavaksi -d-valitsimen takia"
 
-#: grep-dctrl.c:827
+#: grep-dctrl.c:851
 msgid "cannot suppress field names when showing whole paragraphs"
 msgstr ""
 "en voi jättää näyttämättä kenttien nimiä, kun näytän kokonaisia tietueita"
 
-#: grep-dctrl.c:861
+#: grep-dctrl.c:885
 #, c-format
 msgid "%s: %s: cannot stat: %s\n"
 msgstr "%s: %s: stat-kutsu epäonnistui: %s\n"
 
-#: grep-dctrl.c:870
+#: grep-dctrl.c:894
 msgid "is a directory, skipping"
 msgstr "on hakemisto, jätän huomiotta"
 
-#: grep-dctrl.c:871
+#: grep-dctrl.c:895
 msgid "is a block device, skipping"
 msgstr "on lohkolaite, jätän huomiotta"
 
-#: grep-dctrl.c:872
+#: grep-dctrl.c:896
 msgid "internal error"
 msgstr "ohjelman oma virhe"
 
-#: grep-dctrl.c:873
+#: grep-dctrl.c:897
 msgid "is a socket, skipping"
 msgstr "on pistoke, jätän huomiotta"
 
-#: grep-dctrl.c:874
+#: grep-dctrl.c:898
 msgid "unknown file type, skipping"
 msgstr "tuntematon tiedostotyyppi, jätän huomiotta"
 
diff --git a/po/fr.po b/po/fr.po
index a6f1916..1da15e9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dctrl-tools 2.0\n"
 "Report-Msgid-Bugs-To: ajk@debian.org\n"
-"POT-Creation-Date: 2004-07-12 17:51+0300\n"
+"POT-Creation-Date: 2004-07-17 04:42+0300\n"
 "PO-Revision-Date: 2004-07-03 23:48+0200\n"
 "Last-Translator: Nicolas Bertolissio <nico.bertol@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -19,35 +19,35 @@ msgstr ""
 msgid "grep-dctrl -- grep Debian control files"
 msgstr "grep-dctrl -- sélection dans des fichiers de contrôle Debian"
 
-#: grep-dctrl.c:101
+#: grep-dctrl.c:105
 msgid "Show the testing banner."
 msgstr "Afficher la bannière de test"
 
-#: grep-dctrl.c:103
+#: grep-dctrl.c:107
 msgid "LEVEL"
 msgstr "NIVEAU"
 
-#: grep-dctrl.c:103
+#: grep-dctrl.c:107
 msgid "Set debugging level to LEVEL."
 msgstr "Sélectionner le niveau de débogage NIVEAU"
 
-#: grep-dctrl.c:104 grep-dctrl.c:106
+#: grep-dctrl.c:108 grep-dctrl.c:110
 msgid "FIELD,FIELD,..."
 msgstr "CHAMP,CHAMP,..."
 
-#: grep-dctrl.c:104
+#: grep-dctrl.c:108
 msgid "Restrict pattern matching to the FIELDs given."
 msgstr "Restreindre le motif de correspondance aux CHAMPS fournis"
 
-#: grep-dctrl.c:105
+#: grep-dctrl.c:109
 msgid "This is a shorthand for -FPackage."
 msgstr "Il s'agit d'un raccourci pour -FPackage."
 
-#: grep-dctrl.c:106
+#: grep-dctrl.c:110
 msgid "Show only the body of these fields from the matching paragraphs."
 msgstr "N'afficher que le corps des champs des paragraphes qui correspondent"
 
-#: grep-dctrl.c:107
+#: grep-dctrl.c:111
 msgid ""
 "Show only the first line of the \"Description\" field from the matching "
 "paragraphs."
@@ -55,209 +55,209 @@ msgstr ""
 "N'afficher que la première ligne du champ « Description » des paragraphes "
 "qui correspondent"
 
-#: grep-dctrl.c:108
+#: grep-dctrl.c:112
 msgid "Suppress field names when showing specified fields."
 msgstr "Supprimer les noms de champs lors de l'affichage des champs spécifiés"
 
-#: grep-dctrl.c:109
+#: grep-dctrl.c:113
 msgid "Regard the pattern as an extended POSIX regular expression."
 msgstr "Considérer le motif comme une expression rationnelle POSIX étendue"
 
-#: grep-dctrl.c:110
+#: grep-dctrl.c:114
 msgid "The pattern is a standard POSIX regular expression."
 msgstr "Le motif est une expression rationnelle POSIX standard."
 
-#: grep-dctrl.c:111
+#: grep-dctrl.c:115
 msgid "Ignore case when looking for a match."
 msgstr "Ignorer la casse lors de la recherche d'un motif"
 
-#: grep-dctrl.c:112
+#: grep-dctrl.c:116
 msgid "Show only paragraphs that do not match."
 msgstr "N'afficher que les paragraphes qui ne correspondent pas"
 
-#: grep-dctrl.c:113
+#: grep-dctrl.c:117
 msgid "Show only the count of matching paragraphs."
 msgstr "N'afficher que le nombre de paragraphes qui correspondent"
 
-#: grep-dctrl.c:114
+#: grep-dctrl.c:118
 msgid "FNAME"
 msgstr "FICHIER"
 
-#: grep-dctrl.c:114
+#: grep-dctrl.c:118
 msgid "Use FNAME as the config file."
 msgstr "Utiliser FICHIER comme fichier de configuration"
 
-#: grep-dctrl.c:115
+#: grep-dctrl.c:119
 msgid "Do an exact match."
 msgstr "Rechercher une correspondance exacte"
 
-#: grep-dctrl.c:116
+#: grep-dctrl.c:120
 msgid "Print out the copyright license."
 msgstr "Afficher la licence"
 
-#: grep-dctrl.c:117
+#: grep-dctrl.c:121
 msgid "Conjunct predicates."
 msgstr "Associer les prédicats"
 
-#: grep-dctrl.c:118
+#: grep-dctrl.c:122
 msgid "Disjunct predicates."
 msgstr "Dissocier les prédicats"
 
-#: grep-dctrl.c:119
+#: grep-dctrl.c:123
 msgid "Negate the following predicate."
 msgstr "Inverser le prédicat suivant"
 
-#: grep-dctrl.c:120
+#: grep-dctrl.c:124
 msgid "Test for numerical equality."
 msgstr "Test d'égalité numérique"
 
-#: grep-dctrl.c:121
+#: grep-dctrl.c:125
 msgid "Numerical test: <."
 msgstr "Test numérique : <"
 
-#: grep-dctrl.c:122
+#: grep-dctrl.c:126
 msgid "Numerical test: <=."
 msgstr "Test numérique : <="
 
-#: grep-dctrl.c:123
+#: grep-dctrl.c:127
 msgid "Numerical test: >."
 msgstr "Test numérique : >"
 
-#: grep-dctrl.c:124
+#: grep-dctrl.c:128
 msgid "Numerical test: >=."
 msgstr "Test numérique : >="
 
-#: grep-dctrl.c:125
+#: grep-dctrl.c:129
 msgid "Debug option parsing."
 msgstr "Déboguer l'analyse des options"
 
-#: grep-dctrl.c:126 grep-dctrl.c:127
+#: grep-dctrl.c:130 grep-dctrl.c:131
 msgid "Do no output to stdout."
 msgstr "Pas de sortie sur la sortie standard"
 
-#: grep-dctrl.c:205 grep-dctrl.c:318 predicate.c:41
+#: grep-dctrl.c:209 grep-dctrl.c:322 predicate.c:41
 msgid "predicate is too complex"
 msgstr "le prédicat est trop complexe"
 
-#: grep-dctrl.c:286
+#: grep-dctrl.c:290
 #, fuzzy
 msgid "predicate is too long"
 msgstr "le prédicat est trop complexe"
 
-#: grep-dctrl.c:343
+#: grep-dctrl.c:347
 msgid "inconsistent atom modifiers"
 msgstr "modificateurs d'atome incohérents"
 
-#: grep-dctrl.c:410
+#: grep-dctrl.c:414
 msgid "no such log level"
 msgstr "niveau de journalisation inexistant"
 
-#: grep-dctrl.c:510
+#: grep-dctrl.c:534
 msgid "too many file names"
 msgstr "trop de noms de fichiers"
 
-#: grep-dctrl.c:591
+#: grep-dctrl.c:615
 #, c-format
 msgid "%s: command (%s) failed (exit status %d)\n"
 msgstr "%s : la commande (%s) a échoué (état de sortie %d)\n"
 
-#: grep-dctrl.c:600
+#: grep-dctrl.c:624
 #, c-format
 msgid "%s: command (%s) was killed by signal %d\n"
 msgstr "%s : la commande (%s) a été tuée par le signal %d\n"
 
-#: grep-dctrl.c:638
+#: grep-dctrl.c:662
 #, c-format
 msgid "%s (child): failed to exec /bin/sh: %s\n"
 msgstr "%s (enfant) : échec d'exécution de /bin/sh : %s\n"
 
-#: grep-dctrl.c:692
+#: grep-dctrl.c:716
 #, fuzzy
 msgid "unexpected end of predicate"
 msgstr "fin de fichier inattendue"
 
-#: grep-dctrl.c:695
+#: grep-dctrl.c:719
 #, fuzzy
 msgid "unexpected '!' in command line"
 msgstr "« ) » inattendue sur la ligne de commande"
 
-#: grep-dctrl.c:698
+#: grep-dctrl.c:722
 #, fuzzy
 msgid "unexpected '-a' in command line"
 msgstr "« ) » inattendue sur la ligne de commande"
 
-#: grep-dctrl.c:701
+#: grep-dctrl.c:725
 #, fuzzy
 msgid "unexpected '-o' in command line"
 msgstr "« ) » inattendue sur la ligne de commande"
 
-#: grep-dctrl.c:704
+#: grep-dctrl.c:728
 #, fuzzy
 msgid "unexpected '(' in command line"
 msgstr "« ) » inattendue sur la ligne de commande"
 
-#: grep-dctrl.c:707
+#: grep-dctrl.c:731
 msgid "unexpected ')' in command line"
 msgstr "« ) » inattendue sur la ligne de commande"
 
-#: grep-dctrl.c:711
+#: grep-dctrl.c:735
 #, fuzzy
 msgid "unexpected atom in command line"
 msgstr "« ) » inattendue sur la ligne de commande"
 
-#: grep-dctrl.c:724
+#: grep-dctrl.c:748
 msgid "missing ')' in command line"
 msgstr "« ) » manquante sur la ligne de commande"
 
-#: grep-dctrl.c:796
+#: grep-dctrl.c:820
 msgid "A pattern is mandatory"
 msgstr "Un motif est nécessaire"
 
-#: grep-dctrl.c:803
+#: grep-dctrl.c:827
 msgid "a predicate is required"
 msgstr "un prédicat est nécessaire"
 
-#: grep-dctrl.c:808
+#: grep-dctrl.c:832
 msgid "malformed predicate"
 msgstr "prédicat mal formé"
 
-#: grep-dctrl.c:814
+#: grep-dctrl.c:838
 msgid "too many output fields"
 msgstr "trop de champs de sortie"
 
-#: grep-dctrl.c:818
+#: grep-dctrl.c:842
 msgid "Adding \"Description\" to selected output fields because of -d"
 msgstr ""
 "Ajout de « Description » aux champs de sortie sélectionnés à cause de -d"
 
-#: grep-dctrl.c:827
+#: grep-dctrl.c:851
 msgid "cannot suppress field names when showing whole paragraphs"
 msgstr ""
 "impossible de supprimer les noms de champs lors de l'affichage des "
 "paragraphes complets"
 
-#: grep-dctrl.c:861
+#: grep-dctrl.c:885
 #, c-format
 msgid "%s: %s: cannot stat: %s\n"
 msgstr "%s : impossible d'analyser « %s » : %s\n"
 
-#: grep-dctrl.c:870
+#: grep-dctrl.c:894
 msgid "is a directory, skipping"
 msgstr "est un répertoire, ignoré"
 
-#: grep-dctrl.c:871
+#: grep-dctrl.c:895
 msgid "is a block device, skipping"
 msgstr "est un périphérique bloc, ignoré"
 
-#: grep-dctrl.c:872
+#: grep-dctrl.c:896
 msgid "internal error"
 msgstr "erreur interne"
 
-#: grep-dctrl.c:873
+#: grep-dctrl.c:897
 msgid "is a socket, skipping"
 msgstr "est une socket, ignorée"
 
-#: grep-dctrl.c:874
+#: grep-dctrl.c:898
 msgid "unknown file type, skipping"
 msgstr "type de fichier inconnu, ignoré"
 
diff --git a/po/it.po b/po/it.po
index a55f304..c998913 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dctrl-tools 2.6\n"
 "Report-Msgid-Bugs-To: ajk@debian.org\n"
-"POT-Creation-Date: 2004-07-12 17:51+0300\n"
+"POT-Creation-Date: 2004-07-17 04:42+0300\n"
 "PO-Revision-Date: 2004-07-09 15:57+0300\n"
 "Last-Translator: Danilo Piazzalunga <danilopiazza@libero.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -21,39 +21,39 @@ msgid "grep-dctrl -- grep Debian control files"
 msgstr "grep-dctrl -- ricerca attraverso i file di controllo di Debian"
 
 # NdT: Sì, questa traduzione è appropriata ;-)
-#: grep-dctrl.c:101
+#: grep-dctrl.c:105
 msgid "Show the testing banner."
 msgstr "Mostra l'avviso fastidioso."
 
-#: grep-dctrl.c:103
+#: grep-dctrl.c:107
 msgid "LEVEL"
 msgstr "LIVELLO"
 
-#: grep-dctrl.c:103
+#: grep-dctrl.c:107
 msgid "Set debugging level to LEVEL."
 msgstr "Imposta il livello di debug a LIVELLO."
 
-#: grep-dctrl.c:104 grep-dctrl.c:106
+#: grep-dctrl.c:108 grep-dctrl.c:110
 msgid "FIELD,FIELD,..."
 msgstr "CAMPO,CAMPO,..."
 
 # Ndt: era msgstr "Restringe la ricerca dei modelli ai campi specificati."
-#: grep-dctrl.c:104
+#: grep-dctrl.c:108
 msgid "Restrict pattern matching to the FIELDs given."
 msgstr "Cerca le corrispondenze solo all'interno dei campi specificati."
 
-#: grep-dctrl.c:105
+#: grep-dctrl.c:109
 msgid "This is a shorthand for -FPackage."
 msgstr "Questa è una forma abbreviata per «-FPackage»."
 
 # NdT: era msgstr "Mostra solo i campi specificati anziché l'intero "
 # "paragrafo corrispondente."
-#: grep-dctrl.c:106
+#: grep-dctrl.c:110
 msgid "Show only the body of these fields from the matching paragraphs."
 msgstr ""
 "Mostra solo il valore dei campi selezionati del paragrafo corrispondente."
 
-#: grep-dctrl.c:107
+#: grep-dctrl.c:111
 msgid ""
 "Show only the first line of the \"Description\" field from the matching "
 "paragraphs."
@@ -61,205 +61,205 @@ msgstr ""
 "Mostra solo la prima riga del campo «Description» dei paragrafi "
 "corrispondenti."
 
-#: grep-dctrl.c:108
+#: grep-dctrl.c:112
 msgid "Suppress field names when showing specified fields."
 msgstr "Mostra solo il contenuto (e non il nome) dei campi specificati."
 
-#: grep-dctrl.c:109
+#: grep-dctrl.c:113
 msgid "Regard the pattern as an extended POSIX regular expression."
 msgstr "Considera il modello come un'espressione regolare POSIX estesa."
 
-#: grep-dctrl.c:110
+#: grep-dctrl.c:114
 msgid "The pattern is a standard POSIX regular expression."
 msgstr "Considera il modello come un'espressione regolare POSIX standard."
 
-#: grep-dctrl.c:111
+#: grep-dctrl.c:115
 msgid "Ignore case when looking for a match."
 msgstr "Ignora maiuscole/minuscole durante il confronto."
 
-#: grep-dctrl.c:112
+#: grep-dctrl.c:116
 msgid "Show only paragraphs that do not match."
 msgstr "Mostra solo i paragrafi non corrispondenti."
 
 # Ndt: grep(1) usa «conto»; io preferisco «conteggio» o «numero».
-#: grep-dctrl.c:113
+#: grep-dctrl.c:117
 msgid "Show only the count of matching paragraphs."
 msgstr "Mostra solo il conteggio dei paragrafi corrispondenti."
 
-#: grep-dctrl.c:114
+#: grep-dctrl.c:118
 msgid "FNAME"
 msgstr "NOMEFILE"
 
-#: grep-dctrl.c:114
+#: grep-dctrl.c:118
 msgid "Use FNAME as the config file."
 msgstr "Usa NOMEFILE come file di configurazione."
 
-#: grep-dctrl.c:115
+#: grep-dctrl.c:119
 msgid "Do an exact match."
 msgstr "Cerca solo corrispondenze esatte."
 
-#: grep-dctrl.c:116
+#: grep-dctrl.c:120
 msgid "Print out the copyright license."
 msgstr "Mostra la licenza."
 
-#: grep-dctrl.c:117
+#: grep-dctrl.c:121
 msgid "Conjunct predicates."
 msgstr "Effettua la congiunzione di due predicati."
 
-#: grep-dctrl.c:118
+#: grep-dctrl.c:122
 msgid "Disjunct predicates."
 msgstr "Effettua la disgiunzione di due predicati."
 
-#: grep-dctrl.c:119
+#: grep-dctrl.c:123
 msgid "Negate the following predicate."
 msgstr "Negazione del predicato che lo segue."
 
-#: grep-dctrl.c:120
+#: grep-dctrl.c:124
 msgid "Test for numerical equality."
 msgstr "Controlla l'uguaglianza numerica."
 
-#: grep-dctrl.c:121
+#: grep-dctrl.c:125
 msgid "Numerical test: <."
 msgstr "Effettua il test numerico: <."
 
-#: grep-dctrl.c:122
+#: grep-dctrl.c:126
 msgid "Numerical test: <=."
 msgstr "Effettua il test numerico: <=."
 
-#: grep-dctrl.c:123
+#: grep-dctrl.c:127
 msgid "Numerical test: >."
 msgstr "Effettua il test numerico: >."
 
-#: grep-dctrl.c:124
+#: grep-dctrl.c:128
 msgid "Numerical test: >=."
 msgstr "Effettua il test numerico: >=."
 
-#: grep-dctrl.c:125
+#: grep-dctrl.c:129
 msgid "Debug option parsing."
 msgstr "Fa il debug dell'analisi delle opzioni."
 
-#: grep-dctrl.c:126 grep-dctrl.c:127
+#: grep-dctrl.c:130 grep-dctrl.c:131
 msgid "Do no output to stdout."
 msgstr "Non invia output verso stdout."
 
-#: grep-dctrl.c:205 grep-dctrl.c:318 predicate.c:41
+#: grep-dctrl.c:209 grep-dctrl.c:322 predicate.c:41
 msgid "predicate is too complex"
 msgstr "il predicato è troppo complesso"
 
-#: grep-dctrl.c:286
+#: grep-dctrl.c:290
 msgid "predicate is too long"
 msgstr "il predicato è troppo lungo"
 
 # Ndt: appare se si usano le opzioni per BRE, ERE o exact match tutte insieme.
-#: grep-dctrl.c:343
+#: grep-dctrl.c:347
 msgid "inconsistent atom modifiers"
 msgstr "modificatori di atomi incoerenti"
 
-#: grep-dctrl.c:410
+#: grep-dctrl.c:414
 msgid "no such log level"
 msgstr "livello di log inesistente"
 
-#: grep-dctrl.c:510
+#: grep-dctrl.c:534
 msgid "too many file names"
 msgstr "troppi nomi di file"
 
-#: grep-dctrl.c:591
+#: grep-dctrl.c:615
 #, c-format
 msgid "%s: command (%s) failed (exit status %d)\n"
 msgstr "%s: il comando (%s) non è riuscito (stato di uscita %d)\n"
 
-#: grep-dctrl.c:600
+#: grep-dctrl.c:624
 #, c-format
 msgid "%s: command (%s) was killed by signal %d\n"
 msgstr "%s: il comando (%s) è stato ucciso dal segnale %d\n"
 
-#: grep-dctrl.c:638
+#: grep-dctrl.c:662
 #, c-format
 msgid "%s (child): failed to exec /bin/sh: %s\n"
 msgstr "%s (figlio): impossibile eseguire /bin/sh: %s\n"
 
-#: grep-dctrl.c:692
+#: grep-dctrl.c:716
 msgid "unexpected end of predicate"
 msgstr "improvvisa fine del predicato"
 
-#: grep-dctrl.c:695
+#: grep-dctrl.c:719
 msgid "unexpected '!' in command line"
 msgstr "«!» non previsto sulla riga di comando"
 
-#: grep-dctrl.c:698
+#: grep-dctrl.c:722
 msgid "unexpected '-a' in command line"
 msgstr "«-a» non previsto sulla riga di comando"
 
-#: grep-dctrl.c:701
+#: grep-dctrl.c:725
 msgid "unexpected '-o' in command line"
 msgstr "«-o» non previsto sulla riga di comando"
 
-#: grep-dctrl.c:704
+#: grep-dctrl.c:728
 msgid "unexpected '(' in command line"
 msgstr "«(» non prevista sulla riga di comando"
 
-#: grep-dctrl.c:707
+#: grep-dctrl.c:731
 msgid "unexpected ')' in command line"
 msgstr "«)» non prevista sulla riga di comando"
 
-#: grep-dctrl.c:711
+#: grep-dctrl.c:735
 msgid "unexpected atom in command line"
 msgstr "atomo non previsto sulla riga di comando"
 
-#: grep-dctrl.c:724
+#: grep-dctrl.c:748
 msgid "missing ')' in command line"
 msgstr "manca una «)» sulla riga di comando"
 
-#: grep-dctrl.c:796
+#: grep-dctrl.c:820
 msgid "A pattern is mandatory"
 msgstr "Bisogna specificare un modello di ricerca"
 
-#: grep-dctrl.c:803
+#: grep-dctrl.c:827
 msgid "a predicate is required"
 msgstr "bisogna specificare un predicato"
 
 # NdT: credo che il termine tecnico corretto sia
 # «well-formed» --> «ben formato».
-#: grep-dctrl.c:808
+#: grep-dctrl.c:832
 msgid "malformed predicate"
 msgstr "il predicato non è ben formato"
 
-#: grep-dctrl.c:814
+#: grep-dctrl.c:838
 msgid "too many output fields"
 msgstr "troppi campi da visualizzare"
 
-#: grep-dctrl.c:818
+#: grep-dctrl.c:842
 msgid "Adding \"Description\" to selected output fields because of -d"
 msgstr "È stato aggiunto «Description» ai campi da mostrare a causa di -d"
 
-#: grep-dctrl.c:827
+#: grep-dctrl.c:851
 msgid "cannot suppress field names when showing whole paragraphs"
 msgstr ""
 "impossibile omettere i nomi dei campi quando si mostra l'intero paragrafo"
 
 # NdT: questa traduzione rispecchia quella di cp, mv, rm, etc.
-#: grep-dctrl.c:861
+#: grep-dctrl.c:885
 #, c-format
 msgid "%s: %s: cannot stat: %s\n"
 msgstr "%s: impossibile fare stat di «%s»: %s\n"
 
-#: grep-dctrl.c:870
+#: grep-dctrl.c:894
 msgid "is a directory, skipping"
 msgstr "è una directory e viene ignorata"
 
-#: grep-dctrl.c:871
+#: grep-dctrl.c:895
 msgid "is a block device, skipping"
 msgstr "è un file speciale a blocchi e viene ignorato"
 
-#: grep-dctrl.c:872
+#: grep-dctrl.c:896
 msgid "internal error"
 msgstr "errore interno"
 
-#: grep-dctrl.c:873
+#: grep-dctrl.c:897
 msgid "is a socket, skipping"
 msgstr "è un socket e viene ignorato"
 
-#: grep-dctrl.c:874
+#: grep-dctrl.c:898
 msgid "unknown file type, skipping"
 msgstr "è un file di tipo sconosciuto e viene ignorato"