From: Guillem Jover <guillem@debian.org>
Date: Fri, 2 Jun 2006 03:45:21 +0000 (+0000)
Subject: Disambiguate error message about conflicting command line actions by
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad13d218499a7224fc8b5904014aac17da757a09;p=dpkg

Disambiguate error message about conflicting command line actions by
providing both long and short option names. Based on a suggestion by
Josip Rodin. Closes: #45575
---

diff --git a/ChangeLog b/ChangeLog
index 83d3439c..6b57dab9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-02  Guillem Jover  <guillem@debian.org>
+
+	* src/query.c (setaction): Print also the short command line action.
+	* src/main.c (setaction): Likewise.
+	* dpkg-deb/main.c (setaction): Likewise.
+	* dpkg-split/main.c (setaction): Likewise.
+
 2006-05-31  Guillem Jover  <guillem@debian.org>
 
 	* configure.ac: Bump version to 1.13.21~.
diff --git a/debian/changelog b/debian/changelog
index 5770da01..a2b87453 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 dpkg (1.13.21~) UNRELEASED; urgency=low
 
+  [ Guillem Jover ]
+  * Disambiguate error message about conflicting command line actions by
+    providing both long and short option names. Based on a suggestion by
+    Josip Rodin. Closes: #45575
 
  -- Guillem Jover <guillem@debian.org>  Wed, 31 May 2006 08:03:11 +0300
 
diff --git a/dpkg-deb/main.c b/dpkg-deb/main.c
index 6391dca3..a75917bc 100644
--- a/dpkg-deb/main.c
+++ b/dpkg-deb/main.c
@@ -174,7 +174,8 @@ static const struct cmdinfo cmdinfos[]= {
 
 static void setaction(const struct cmdinfo *cip, const char *value) {
   if (cipaction)
-    badusage(_("conflicting actions --%s and --%s"),cip->olong,cipaction->olong);
+    badusage(_("conflicting actions -%c (--%s) and -%c (--%s)"),
+             cip->oshort, cip->olong, cipaction->oshort, cipaction->olong);
   cipaction= cip;
   assert((int)(cip-cmdinfos) < (int)(sizeof(dofunctions)*sizeof(dofunction*)));
   action= dofunctions[cip-cmdinfos];
diff --git a/dpkg-split/main.c b/dpkg-split/main.c
index c8f6710f..47613542 100644
--- a/dpkg-split/main.c
+++ b/dpkg-split/main.c
@@ -154,7 +154,8 @@ static const struct cmdinfo cmdinfos[]= {
 
 static void setaction(const struct cmdinfo *cip, const char *value) {
   if (cipaction)
-    badusage(_("conflicting actions --%s and --%s"),cip->olong,cipaction->olong);
+    badusage(_("conflicting actions -%c (--%s) and -%c (--%s)"),
+             cip->oshort, cip->olong, cipaction->oshort, cipaction->olong);
   cipaction= cip;
   assert((int)(cip-cmdinfos) < (int)(sizeof(dofunctions)*sizeof(dofunction*)));
   action= dofunctions[cip-cmdinfos];
diff --git a/po/ChangeLog b/po/ChangeLog
index 36498b16..bf96ec9c 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-02  Guillem Jover  <guillem@debian.org>
+
+	* dpkg.pot: Regenerated.
+	* *.po: Merged with dpkg.pot. Formerly complete translations
+	become 937t1f.
+
 2006-05-31  Guillem Jover  <guillem@debian.org>
 
 	* dpkg.pot: Regenerated.
diff --git a/po/bs.po b/po/bs.po
index 92978051..c049fc6c 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-31 06:03+0300\n"
+"POT-Creation-Date: 2006-06-02 03:58+0300\n"
 "PO-Revision-Date: 2006-02-17 08:50+0200\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -2175,15 +2175,15 @@ msgstr ""
 
 #: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
 #, c-format
-msgid "conflicting actions --%s and --%s"
+msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr ""
 
-#: src/main.c:211
+#: src/main.c:212
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr ""
 
-#: src/main.c:219
+#: src/main.c:220
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2204,26 +2204,26 @@ msgid ""
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:240
+#: src/main.c:241
 msgid "--debug requires an octal argument"
 msgstr ""
 
-#: src/main.c:264
+#: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 
-#: src/main.c:270
+#: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 
-#: src/main.c:286 src/main.c:297
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:318
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2263,53 +2263,53 @@ msgid ""
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:362
+#: src/main.c:363
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr ""
 
-#: src/main.c:367
+#: src/main.c:368
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr ""
 
-#: src/main.c:490 src/main.c:500 src/main.c:508
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr ""
 
-#: src/main.c:494 src/main.c:517
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr ""
 
-#: src/main.c:522
+#: src/main.c:523
 #, c-format
 msgid "failed to exec %s"
 msgstr ""
 
-#: src/main.c:537
+#: src/main.c:538
 msgid "--command-fd takes one argument, not zero"
 msgstr ""
 
-#: src/main.c:539
+#: src/main.c:540
 msgid "--command-fd only takes one argument"
 msgstr ""
 
-#: src/main.c:541
+#: src/main.c:542
 msgid "invalid number for --command-fd"
 msgstr ""
 
-#: src/main.c:543
+#: src/main.c:544
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr ""
 
-#: src/main.c:568
+#: src/main.c:569
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr ""
 
-#: src/main.c:612 src/main.c:627 src/query.c:579 dpkg-deb/main.c:199
-#: dpkg-split/main.c:169
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr ""
 
@@ -3519,7 +3519,7 @@ msgid ""
 "Type dpkg --help for help about installing and deinstalling packages."
 msgstr ""
 
-#: dpkg-deb/main.c:191
+#: dpkg-deb/main.c:192
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 273efc3d..cfa78f5a 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-31 06:03+0300\n"
+"POT-Creation-Date: 2006-06-02 03:58+0300\n"
 "PO-Revision-Date: 2006-02-17 08:51+0200\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -2361,16 +2361,16 @@ msgstr ""
 "a través de «less» o «more»!"
 
 #: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
-#, c-format
-msgid "conflicting actions --%s and --%s"
+#, fuzzy, c-format
+msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "accions en conflicte --%s i --%s"
 
-#: src/main.c:211
+#: src/main.c:212
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Avís: l'opció és obsoleta «--%s»\n"
 
-#: src/main.c:219
+#: src/main.c:220
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2407,29 +2407,29 @@ msgstr ""
 "Les opcions de depuració es barregen fent el OR bit a bit.\n"
 "Noteu que els significats i els valors estan subjectes a canvis.\n"
 
-#: src/main.c:240
+#: src/main.c:241
 msgid "--debug requires an octal argument"
 msgstr "--debug requereix d'un número octal com a paràmetre"
 
-#: src/main.c:264
+#: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "nom de paquet buit en la llista de --ignore-depends separats per coma "
 "«%.250s»"
 
-#: src/main.c:270
+#: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends necessita un nom de paquet legal. «%.250s» no ho és; %s"
 
-#: src/main.c:286 src/main.c:297
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "enter invàlid per a --%s: «%.250s»"
 
-#: src/main.c:317
+#: src/main.c:318
 #, fuzzy, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2518,55 +2518,55 @@ msgstr ""
 "seriosament la instal·lació. Les opcions de forçat marcades amb [*] estan\n"
 "activades per defecte.\n"
 
-#: src/main.c:362
+#: src/main.c:363
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "opció force/refuse desconeguda «%.*s»"
 
-#: src/main.c:367
+#: src/main.c:368
 #, fuzzy, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Avís: l'opció és obsoleta «--%s»\n"
 
-#: src/main.c:490 src/main.c:500 src/main.c:508
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr "no s'ha pogut fer «malloc» en execbackend"
 
-#: src/main.c:494 src/main.c:517
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr "no s'ha pogut fer «strdup» en execbackend"
 
-#: src/main.c:522
+#: src/main.c:523
 #, c-format
 msgid "failed to exec %s"
 msgstr "no s'ha pogut executar %s"
 
-#: src/main.c:537
+#: src/main.c:538
 #, fuzzy
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd accepta 1 argument, no 0"
 
-#: src/main.c:539
+#: src/main.c:540
 #, fuzzy
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd només accepta 1 argument"
 
-#: src/main.c:541
+#: src/main.c:542
 msgid "invalid number for --command-fd"
 msgstr "número invàlid per a --command-fd"
 
-#: src/main.c:543
+#: src/main.c:544
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "no s'ha pogut obrir «%i» per a un flux"
 
-#: src/main.c:568
+#: src/main.c:569
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "eof inesperat abans de la fí de la línia %d"
 
-#: src/main.c:612 src/main.c:627 src/query.c:579 dpkg-deb/main.c:199
-#: dpkg-split/main.c:169
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "es necessita una opció d'acció"
 
@@ -3914,7 +3914,7 @@ msgstr ""
 "Escriviu dpkg --help per a obtindre ajuda a sobre de com instal·lar i "
 "desinstal·lar paquets."
 
-#: dpkg-deb/main.c:191
+#: dpkg-deb/main.c:192
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "el tipus de compressió «%s» és desconegut!"
diff --git a/po/cs.po b/po/cs.po
index 056466c5..8b4d115a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-31 06:03+0300\n"
+"POT-Creation-Date: 2006-06-02 03:58+0300\n"
 "PO-Revision-Date: 2006-05-29 13:11+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -2365,16 +2365,16 @@ msgstr ""
 "Volby označené [*] produkují obsáhlý výstup - použijte `less' nebo `more' !"
 
 #: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
-#, c-format
-msgid "conflicting actions --%s and --%s"
+#, fuzzy, c-format
+msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "odporující si akce --%s a --%s"
 
-#: src/main.c:211
+#: src/main.c:212
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Varování: zastaralá volba `--%s'\n"
 
-#: src/main.c:219
+#: src/main.c:220
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2412,26 +2412,26 @@ msgstr ""
 "Ladící přepínače mohou být mixovány použitím binárního OR.\n"
 "Poznámka: významy a hodnoty se mohou často měnit.\n"
 
-#: src/main.c:240
+#: src/main.c:241
 msgid "--debug requires an octal argument"
 msgstr "--debug vyžaduje oktalový parametr"
 
-#: src/main.c:264
+#: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr "prázdné jméno balíku v seznamu --ignore-depends `%250s'"
 
-#: src/main.c:270
+#: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr "--ignore-depends potřebuje platné jméno balíku, což `%250s' není; %s"
 
-#: src/main.c:286 src/main.c:297
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "neplatné číslo pro --%s: `%.250s'"
 
-#: src/main.c:317
+#: src/main.c:318
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2510,53 +2510,53 @@ msgstr ""
 "VAROVÁNÍ - použití označených [!] přepínačů může vážně poškodit instalaci.\n"
 "Implicitně zapnuté donucovací volby jsou označeny [*].\n"
 
-#: src/main.c:362
+#: src/main.c:363
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "neznámá force/refuse volba `%.*s'"
 
-#: src/main.c:367
+#: src/main.c:368
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Varování: zastaralá force/refuse volba `%s'\n"
 
-#: src/main.c:490 src/main.c:500 src/main.c:508
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr "nelze provést malloc() v execbackend"
 
-#: src/main.c:494 src/main.c:517
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr "nelze provést strdup v execbackend"
 
-#: src/main.c:522
+#: src/main.c:523
 #, c-format
 msgid "failed to exec %s"
 msgstr "nelze spustit %s"
 
-#: src/main.c:537
+#: src/main.c:538
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd vyžaduje jeden argument"
 
-#: src/main.c:539
+#: src/main.c:540
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd vyžaduje pouze jeden argument"
 
-#: src/main.c:541
+#: src/main.c:542
 msgid "invalid number for --command-fd"
 msgstr "neplatné číslo pro --command-fd"
 
-#: src/main.c:543
+#: src/main.c:544
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "nelze otevřít `%i' pro proud"
 
-#: src/main.c:568
+#: src/main.c:569
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "neočekávaný konec souboru před koncem řádku %d"
 
-#: src/main.c:612 src/main.c:627 src/query.c:579 dpkg-deb/main.c:199
-#: dpkg-split/main.c:169
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "potřebuji zadat akci"
 
@@ -3873,7 +3873,7 @@ msgstr ""
 "Napište dpkg-deb --help k získání nápovědy k manipulaci s *.deb soubory;\n"
 "Napište dpkg --help k získání informací o instalování a odinstalování balíků."
 
-#: dpkg-deb/main.c:191
+#: dpkg-deb/main.c:192
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "neznámý typ komprese `%s'!"
diff --git a/po/da.po b/po/da.po
index 0fe1e86a..3890d95b 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg_1.10.19_da\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-31 06:03+0300\n"
+"POT-Creation-Date: 2006-06-02 03:58+0300\n"
 "PO-Revision-Date: 2006-05-04 09:59+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
 "Language-Team: Danish\n"
@@ -2390,16 +2390,16 @@ msgstr ""
 "'more'!"
 
 #: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
-#, c-format
-msgid "conflicting actions --%s and --%s"
+#, fuzzy, c-format
+msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "modstridende handlinger --%s og --%s"
 
-#: src/main.c:211
+#: src/main.c:212
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Advarsel: forældet tilvalg '--%s'\n"
 
-#: src/main.c:219
+#: src/main.c:220
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2437,26 +2437,26 @@ msgstr ""
 "Aflusningstilvalg kan blandes med logisk og.\n"
 "Bemærk, at betydningerne og værdierne kan blive ændret fremover.\n"
 
-#: src/main.c:240
+#: src/main.c:241
 msgid "--debug requires an octal argument"
 msgstr "--debug kræver et oktalt parameter"
 
-#: src/main.c:264
+#: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr "tomt pakkenavn i --ignore-depends kommasepareret liste '%.250s'"
 
-#: src/main.c:270
+#: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr "--ignore-depends kræver et gyldigt pakkenavn. Det er '%.250s' ikke; %s"
 
-#: src/main.c:286 src/main.c:297
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "ugyldigt heltal for --%s: '%.250s'"
 
-#: src/main.c:317
+#: src/main.c:318
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2535,53 +2535,53 @@ msgstr ""
 "alvorligt.\n"
 "Gennemtvingsningstilvalg mærket [*] er aktiveret som standard.\n"
 
-#: src/main.c:362
+#: src/main.c:363
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "ukendt gennemtvingnings/afvisnings-tilvalg '%.*s'"
 
-#: src/main.c:367
+#: src/main.c:368
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Advarsel: forældet gennemtvangs/afvisnings-tilvalg '--%s'\n"
 
-#: src/main.c:490 src/main.c:500 src/main.c:508
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr "kunne ikke udføre 'malloc' i execbackend"
 
-#: src/main.c:494 src/main.c:517
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr "kunne ikke udføre 'strdup' i execbackend"
 
-#: src/main.c:522
+#: src/main.c:523
 #, c-format
 msgid "failed to exec %s"
 msgstr "kunne ikke eksekvere %s"
 
-#: src/main.c:537
+#: src/main.c:538
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd tager een parameter, ikke nul"
 
-#: src/main.c:539
+#: src/main.c:540
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd tager kun en parameter"
 
-#: src/main.c:541
+#: src/main.c:542
 msgid "invalid number for --command-fd"
 msgstr "ugyldigt tal for  --command-fd"
 
-#: src/main.c:543
+#: src/main.c:544
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "kunne ikke åbne '%i' for strøm"
 
-#: src/main.c:568
+#: src/main.c:569
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "uventet slut-på-fil før afslutningen af linje %d"
 
-#: src/main.c:612 src/main.c:627 src/query.c:579 dpkg-deb/main.c:199
-#: dpkg-split/main.c:169
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "kræver et handlings-tilvalg"
 
@@ -3909,7 +3909,7 @@ msgstr ""
 "Skriv 'dpkg-deb --help' for hjælp med manipulation med *.deb-filer\n"
 "Skriv 'dpkg --help' for hjælp med installation og afinstallation af pakker."
 
-#: dpkg-deb/main.c:191
+#: dpkg-deb/main.c:192
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "ukendt komprimeringstype '%s'!"
diff --git a/po/de.po b/po/de.po
index 581f5dc2..b0c261ca 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.13.11\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-31 06:03+0300\n"
+"POT-Creation-Date: 2006-06-02 03:58+0300\n"
 "PO-Revision-Date: 2006-02-17 08:50+0200\n"
 "Last-Translator: Michael Piefel <piefel@debian.org>\n"
 "Language-Team: German <de@debian-l10n-german@lists.debian.org>\n"
@@ -2324,16 +2324,16 @@ msgstr ""
 "Optionen mit [*] geben viel aus - schicken Sie es durch „less“ oder „more“!"
 
 #: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
-#, c-format
-msgid "conflicting actions --%s and --%s"
+#, fuzzy, c-format
+msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "Aktionen --%s und --%s stehen in Konflikt"
 
-#: src/main.c:211
+#: src/main.c:212
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Warnung: veraltete Option „--%s“\n"
 
-#: src/main.c:219
+#: src/main.c:220
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2370,27 +2370,27 @@ msgstr ""
 "Debug-Optionen werden durch bitweises Oder zusammengesetzt.\n"
 "Beachten Sie, dass sich die Werte und Bedeutungen ändern können.\n"
 
-#: src/main.c:240
+#: src/main.c:241
 msgid "--debug requires an octal argument"
 msgstr "--debug braucht ein oktales Argument"
 
-#: src/main.c:264
+#: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr "leerer Paketname in kommagetrennter --ignore-depends-Liste „%.250s“"
 
-#: src/main.c:270
+#: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends braucht einen legalen Paketnamen. „%.250s“ ist es nicht; %s"
 
-#: src/main.c:286 src/main.c:297
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "ungültige Zahl für --%s: „%.250s“"
 
-#: src/main.c:317
+#: src/main.c:318
 #, fuzzy, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2479,56 +2479,56 @@ msgstr ""
 "schwer\n"
 "beschädigen. Optionen markierten mit [*] sind per Vorgabe angestellt.\n"
 
-#: src/main.c:362
+#: src/main.c:363
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "unbekannte force/refuse-Option „%.*s“"
 
-#: src/main.c:367
+#: src/main.c:368
 #, fuzzy, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Warnung: veraltete Option „--%s“\n"
 
-#: src/main.c:490 src/main.c:500 src/main.c:508
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr "konnte kein malloc durchführen in execbackend"
 
-#: src/main.c:494 src/main.c:517
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr "konnte kein strdup durchführen in execbackend"
 
-#: src/main.c:522
+#: src/main.c:523
 #, c-format
 msgid "failed to exec %s"
 msgstr "konnte %s nicht ausführen"
 
-#: src/main.c:537
+#: src/main.c:538
 #, fuzzy
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd nimmt 1 Argument, nicht 0"
 
 #
-#: src/main.c:539
+#: src/main.c:540
 #, fuzzy
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd nimmt nur 1 Argument"
 
-#: src/main.c:541
+#: src/main.c:542
 msgid "invalid number for --command-fd"
 msgstr "ungültige Zahl für --command-fd"
 
-#: src/main.c:543
+#: src/main.c:544
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "konnte „%i“ nicht für Stream öffnen"
 
-#: src/main.c:568
+#: src/main.c:569
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "unerwartetes Dateiende vor Ende der Zeile %d"
 
-#: src/main.c:612 src/main.c:627 src/query.c:579 dpkg-deb/main.c:199
-#: dpkg-split/main.c:169
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "brauche eine Aktions-Option"
 
@@ -3852,7 +3852,7 @@ msgstr ""
 "Geben Sie dpkg-deb --help ein für Hilfe zum Verändern von *.deb-Dateien;\n"
 "Geben Sie dpkg --help ein für Hilfe zum (De-)Installieren von Paketen."
 
-#: dpkg-deb/main.c:191
+#: dpkg-deb/main.c:192
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "unbekannter Komprimierungstyp „%s“!"
diff --git a/po/dpkg.pot b/po/dpkg.pot
index f9b51b61..28a14023 100644
--- a/po/dpkg.pot
+++ b/po/dpkg.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-31 06:03+0300\n"
+"POT-Creation-Date: 2006-06-02 03:58+0300\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"
@@ -2165,15 +2165,15 @@ msgstr ""
 
 #: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
 #, c-format
-msgid "conflicting actions --%s and --%s"
+msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr ""
 
-#: src/main.c:211
+#: src/main.c:212
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr ""
 
-#: src/main.c:219
+#: src/main.c:220
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2194,26 +2194,26 @@ msgid ""
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:240
+#: src/main.c:241
 msgid "--debug requires an octal argument"
 msgstr ""
 
-#: src/main.c:264
+#: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 
-#: src/main.c:270
+#: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 
-#: src/main.c:286 src/main.c:297
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr ""
 
-#: src/main.c:317
+#: src/main.c:318
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2253,53 +2253,53 @@ msgid ""
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:362
+#: src/main.c:363
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr ""
 
-#: src/main.c:367
+#: src/main.c:368
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr ""
 
-#: src/main.c:490 src/main.c:500 src/main.c:508
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr ""
 
-#: src/main.c:494 src/main.c:517
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr ""
 
-#: src/main.c:522
+#: src/main.c:523
 #, c-format
 msgid "failed to exec %s"
 msgstr ""
 
-#: src/main.c:537
+#: src/main.c:538
 msgid "--command-fd takes one argument, not zero"
 msgstr ""
 
-#: src/main.c:539
+#: src/main.c:540
 msgid "--command-fd only takes one argument"
 msgstr ""
 
-#: src/main.c:541
+#: src/main.c:542
 msgid "invalid number for --command-fd"
 msgstr ""
 
-#: src/main.c:543
+#: src/main.c:544
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr ""
 
-#: src/main.c:568
+#: src/main.c:569
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr ""
 
-#: src/main.c:612 src/main.c:627 src/query.c:579 dpkg-deb/main.c:199
-#: dpkg-split/main.c:169
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr ""
 
@@ -3509,7 +3509,7 @@ msgid ""
 "Type dpkg --help for help about installing and deinstalling packages."
 msgstr ""
 
-#: dpkg-deb/main.c:191
+#: dpkg-deb/main.c:192
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr ""
diff --git a/po/el.po b/po/el.po
index d8d07c39..87c29055 100644
--- a/po/el.po
+++ b/po/el.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg_po_el\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-31 06:03+0300\n"
+"POT-Creation-Date: 2006-06-02 03:58+0300\n"
 "PO-Revision-Date: 2006-02-17 08:51+0200\n"
 "Last-Translator: quad-nrg.net <galaxico@quad-nrg.net>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -2354,16 +2354,16 @@ msgstr ""
 "σωλήνωση με τις εντολές `less' ή `more' !"
 
 #: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
-#, c-format
-msgid "conflicting actions --%s and --%s"
+#, fuzzy, c-format
+msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "συγκρουόμενες δράσεις --%s και --%s"
 
-#: src/main.c:211
+#: src/main.c:212
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Προειδοποίηση: επιλογή εκτός χρήσης `--%s'\n"
 
-#: src/main.c:219
+#: src/main.c:220
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2403,30 +2403,30 @@ msgstr ""
 "άλγεβρα).\n"
 "Σημειώστε ότι οι εξηγήσεις και οι τιμές πιθανόν να αλλάξουν.\n"
 
-#: src/main.c:240
+#: src/main.c:241
 msgid "--debug requires an octal argument"
 msgstr "--debug απαιτεί ένα οκταδικό όρισμα"
 
-#: src/main.c:264
+#: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "μη ορισμένο όνομα πακέτου στην χωρισμένη με κόμμα λίστα της --ignore-"
 "depends  `%.250s'"
 
-#: src/main.c:270
+#: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "η --ignore-depends απαιτεί ένα έγκυρο όνομα πακέτου. Το `%.250s' δεν είναι. %"
 "s"
 
-#: src/main.c:286 src/main.c:297
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "μη έγκυρος ακέραιος για --%s: `%.250s'"
 
-#: src/main.c:317
+#: src/main.c:318
 #, fuzzy, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2510,55 +2510,55 @@ msgstr ""
 "για το σύστημά σας. Ο εξαναγκασμός των επιλογών με σήμανση [*] είναι εξ'\n"
 "ορισμού ενεργοποιημένος.\n"
 
-#: src/main.c:362
+#: src/main.c:363
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "άγνωστη επιλογή force/refuse `%.*s'"
 
-#: src/main.c:367
+#: src/main.c:368
 #, fuzzy, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Προειδοποίηση: επιλογή εκτός χρήσης `--%s'\n"
 
-#: src/main.c:490 src/main.c:500 src/main.c:508
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr "αδύνατη η δέσμευση μνήμης με τη malloc στο execbackend"
 
-#: src/main.c:494 src/main.c:517
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr "αδύνατη η αντιγραφή συμβολοσειράς με τη strdup στο execbackend"
 
-#: src/main.c:522
+#: src/main.c:523
 #, c-format
 msgid "failed to exec %s"
 msgstr "αδύνατη η εκτέλεση του %s"
 
-#: src/main.c:537
+#: src/main.c:538
 #, fuzzy
 msgid "--command-fd takes one argument, not zero"
 msgstr "η --command-fd παίρνει 1 όρισμα, όχι 0"
 
-#: src/main.c:539
+#: src/main.c:540
 #, fuzzy
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd παίρνει μόνο 1 όρισμα"
 
-#: src/main.c:541
+#: src/main.c:542
 msgid "invalid number for --command-fd"
 msgstr "μη έγκυρος αριθμός για το --command-fd"
 
-#: src/main.c:543
+#: src/main.c:544
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "αδύνατο το άνοιγμα του `%i' ως ροή (stream)"
 
-#: src/main.c:568
+#: src/main.c:569
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "απρόσμενο eof πριν το τέλος της γραμμής %d"
 
-#: src/main.c:612 src/main.c:627 src/query.c:579 dpkg-deb/main.c:199
-#: dpkg-split/main.c:169
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "χρειάζεται μια επιλογή ενέργειας"
 
@@ -3897,7 +3897,7 @@ msgstr ""
 "*.deb. Πληκτρολογήστε dpkg --help για βοήθεια σχετικά με εγκατάσταση και\n"
 "απεγκατάσταση πακέτων."
 
-#: dpkg-deb/main.c:191
+#: dpkg-deb/main.c:192
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "άγνωστος τύπος συμπίεσης '%s'!"
diff --git a/po/es.po b/po/es.po
index e1ae2acc..86e46124 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.10.18\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-31 06:03+0300\n"
+"POT-Creation-Date: 2006-06-02 03:58+0300\n"
 "PO-Revision-Date: 2006-03-20 09:12+0100\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -2404,16 +2404,16 @@ msgstr ""
 "¡fíltrela con `less' o con `more'!"
 
 #: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
-#, c-format
-msgid "conflicting actions --%s and --%s"
+#, fuzzy, c-format
+msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "acciones en conflicto --%s y --%s"
 
-#: src/main.c:211
+#: src/main.c:212
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Atención: opción obsoleta `--%s'\n"
 
-#: src/main.c:219
+#: src/main.c:220
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2451,30 +2451,30 @@ msgstr ""
 "Las opciones de depuración se mezclan haciendo el OR bit por bit.\n"
 "Note que los significados y los valores están sujetos a cambios.\n"
 
-#: src/main.c:240
+#: src/main.c:241
 msgid "--debug requires an octal argument"
 msgstr "--debug necesita un número octal como parámetro"
 
-#: src/main.c:264
+#: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "nombre de paquete vacío en la lista de --ignore-depends separados por coma `"
 "%.250s'"
 
-#: src/main.c:270
+#: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends necesita un nombre de paquete legal.\n"
 "`%.250s' no lo es; %s"
 
-#: src/main.c:286 src/main.c:297
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "entero inválido para --%s: `%.250s'"
 
-#: src/main.c:317
+#: src/main.c:318
 #, fuzzy, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2566,55 +2566,55 @@ msgstr ""
 "la instalación. Las opciones de forzado marcadas con [*] están activadas\n"
 "por omisión.\n"
 
-#: src/main.c:362
+#: src/main.c:363
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "opción force/refuse desconocida `%.*s'"
 
-#: src/main.c:367
+#: src/main.c:368
 #, fuzzy, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Atención: opción obsoleta `--%s'\n"
 
-#: src/main.c:490 src/main.c:500 src/main.c:508
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr "no se pudo ejecutar malloc en execbackend"
 
-#: src/main.c:494 src/main.c:517
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr "no se pudo ejecutar strdup en execbackend"
 
-#: src/main.c:522
+#: src/main.c:523
 #, c-format
 msgid "failed to exec %s"
 msgstr "fallo al ejecutar %s"
 
-#: src/main.c:537
+#: src/main.c:538
 #, fuzzy
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd toma 1 argumento, no 0"
 
-#: src/main.c:539
+#: src/main.c:540
 #, fuzzy
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd sólo toma 1 argumento"
 
-#: src/main.c:541
+#: src/main.c:542
 msgid "invalid number for --command-fd"
 msgstr "número inválido para --command-fd"
 
-#: src/main.c:543
+#: src/main.c:544
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "no se pudo abrir `%i' para un flujo"
 
-#: src/main.c:568
+#: src/main.c:569
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "eof inesperado antes del fin de la línea %d"
 
-#: src/main.c:612 src/main.c:627 src/query.c:579 dpkg-deb/main.c:199
-#: dpkg-split/main.c:169
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "se necesita una opción de acción"
 
@@ -3977,7 +3977,7 @@ msgstr ""
 "deb;\n"
 "Escriba dpkg --help para obtener ayuda sobre instalar y desinstalar paquetes."
 
-#: dpkg-deb/main.c:191
+#: dpkg-deb/main.c:192
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "¡tipo de compresión `%s' desconocido!"
diff --git a/po/eu.po b/po/eu.po
index ef8163fa..570590df 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-trunk-eu\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-31 06:03+0300\n"
+"POT-Creation-Date: 2006-06-02 03:58+0300\n"
 "PO-Revision-Date: 2006-05-31 06:04+0300\n"
 "Last-Translator: Piarres Beobiide  <pi@beobide.net>\n"
 "Language-Team: librezale.org <librezale@librezale.org>\n"
@@ -2411,16 +2411,16 @@ msgstr ""
 " [*] duten aukerek irteera luze bat dute - `less' edo `more' bidez erabili!"
 
 #: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
-#, c-format
-msgid "conflicting actions --%s and --%s"
+#, fuzzy, c-format
+msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "ekintza gatazkatsuak --%s eta --%s"
 
-#: src/main.c:211
+#: src/main.c:212
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Kontuz: aukera zaharkitua `--%s'\n"
 
-#: src/main.c:219
+#: src/main.c:220
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2459,27 +2459,27 @@ msgstr ""
 "Arazketa-aukerak OR logikoarekin konbina daitezke.\n"
 "Kontuan hartu esanahiak eta balioak alda daitezkeela.\n"
 
-#: src/main.c:240
+#: src/main.c:241
 msgid "--debug requires an octal argument"
 msgstr "--debug: octal argumentu bat behar du"
 
-#: src/main.c:264
+#: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "pakete-izen nulua --ignore-depends komaz bereizitako `%.250s' zerrendan"
 
-#: src/main.c:270
+#: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr "--ignore-depends: legezko pakete-izena behar du. `%.250s' ez da; %s"
 
-#: src/main.c:286 src/main.c:297
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "baliogabeko osokoa --%s: `%.250s'"
 
-#: src/main.c:317
+#: src/main.c:318
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2557,53 +2557,53 @@ msgstr ""
 "dezake.\n"
 "[*] marka duten behartzeko aukerak gaituta daude lehenespenez.\n"
 
-#: src/main.c:362
+#: src/main.c:363
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "`%.*s' behartzeko/uko egiteko aukera ezezaguna"
 
-#: src/main.c:367
+#: src/main.c:368
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Kontuz: indartze/ukatze aukera zaharkitua `--%s'\n"
 
-#: src/main.c:490 src/main.c:500 src/main.c:508
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr "ezin izan da malloc egin execbackend-en"
 
-#: src/main.c:494 src/main.c:517
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr "ezin izan da strdup egin execbackend-en"
 
-#: src/main.c:522
+#: src/main.c:523
 #, c-format
 msgid "failed to exec %s"
 msgstr "huts egin du %s exekutatzean"
 
-#: src/main.c:537
+#: src/main.c:538
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd: argumentu bat hartzen du, ez 0"
 
-#: src/main.c:539
+#: src/main.c:540
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd: argumentu bat bakarrik hartzen du"
 
-#: src/main.c:541
+#: src/main.c:542
 msgid "invalid number for --command-fd"
 msgstr "--command-fd: baliogabeko zenbakia"
 
-#: src/main.c:543
+#: src/main.c:544
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "ezin izan da `%i' ireki korronterako"
 
-#: src/main.c:568
+#: src/main.c:569
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "ustekabeko eof %d lerroa amaitu aurretik"
 
-#: src/main.c:612 src/main.c:627 src/query.c:579 dpkg-deb/main.c:199
-#: dpkg-split/main.c:169
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "ekintza-aukera bat behar da"
 
@@ -3949,7 +3949,7 @@ msgstr ""
 "Idatzi dpkg-deb --help *.deb fitxategiak manipulatzeko laguntza lortzeko;\n"
 "Idatzi dpkg --help paketeak instalatu eta desinstalatzeko laguntza lortzeko."
 
-#: dpkg-deb/main.c:191
+#: dpkg-deb/main.c:192
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "%s konpresio mota ezezaguna!"
diff --git a/po/fr.po b/po/fr.po
index 93579fe8..4e5dc4be 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-23 06:44+0300\n"
+"POT-Creation-Date: 2006-06-02 03:58+0300\n"
 "PO-Revision-Date: 2006-05-03 19:43+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1930,14 +1930,9 @@ msgstr ""
 msgid "--compare-versions bad relation"
 msgstr "--compare-versions : mauvaise relation"
 
-#: src/enquiry.c:429
-#, c-format
-msgid "version a has bad syntax: %s\n"
-msgstr "mauvaise syntaxe de la version « a » : %s\n"
-
-#: src/enquiry.c:439
-#, c-format
-msgid "version b has bad syntax: %s\n"
+#: src/enquiry.c:429 src/enquiry.c:440
+#, fuzzy, c-format
+msgid "dpkg: version '%s' has bad syntax: %s\n"
 msgstr "mauvaise syntaxe de la version « b » : %s\n"
 
 #: src/errors.c:58
@@ -2552,16 +2547,16 @@ msgstr ""
 "à travers « less » ou « more »."
 
 #: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
-#, c-format
-msgid "conflicting actions --%s and --%s"
+#, fuzzy, c-format
+msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "actions conflictuelles --%s et --%s"
 
-#: src/main.c:211
+#: src/main.c:212
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Attention : option obsolète « --%s »\n"
 
-#: src/main.c:219
+#: src/main.c:220
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2603,30 +2598,30 @@ msgstr ""
 "Les options de débogage peuvent être groupées avec un « ou » logique.\n"
 "Notez que la signification et les valeurs sont sujettes à changements.\n"
 
-#: src/main.c:240
+#: src/main.c:241
 msgid "--debug requires an octal argument"
 msgstr "--debug requiert un paramètre octal"
 
-#: src/main.c:264
+#: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "nom de paquet vide dans la liste « %.250s » d'éléments séparés par des "
 "virgules de --ignore-depends"
 
-#: src/main.c:270
+#: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends requiert un nom de paquet légal. « %.250s » ne l'est pas ; %"
 "s"
 
-#: src/main.c:286 src/main.c:297
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "entier incorrect pour --%s « %.250s »"
 
-#: src/main.c:317
+#: src/main.c:318
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2715,53 +2710,53 @@ msgstr ""
 "           installation.\n"
 "Les options de forçage marquées [*] sont activées par défaut.\n"
 
-#: src/main.c:362
+#: src/main.c:363
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "option de forçage/refus « %.*s » inconnue"
 
-#: src/main.c:367
+#: src/main.c:368
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Attention : option de forçage/refus « %s » obsolète\n"
 
-#: src/main.c:490 src/main.c:500 src/main.c:508
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr "Impossible de faire un « malloc » dans « execbackend »"
 
-#: src/main.c:494 src/main.c:517
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr "Impossible de faire un « strdup » dans « execbackend »"
 
-#: src/main.c:522
+#: src/main.c:523
 #, c-format
 msgid "failed to exec %s"
 msgstr "échec de l'exécution de « %s »"
 
-#: src/main.c:537
+#: src/main.c:538
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd prend un paramètre et non zéro"
 
-#: src/main.c:539
+#: src/main.c:540
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd ne prend qu'un paramètre"
 
-#: src/main.c:541
+#: src/main.c:542
 msgid "invalid number for --command-fd"
 msgstr "nombre invalide pour --command-fd"
 
-#: src/main.c:543
+#: src/main.c:544
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "impossible d'ouvrir le flux d'entrée « %i »"
 
-#: src/main.c:568
+#: src/main.c:569
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "EOF inattendu avant la fin de la ligne %d"
 
-#: src/main.c:612 src/main.c:627 src/query.c:579 dpkg-deb/main.c:199
-#: dpkg-split/main.c:169
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "requiert une option d'action"
 
@@ -4150,7 +4145,7 @@ msgstr ""
 "Taper dpkg --help pour obtenir une aide sur l'installation et la "
 "désinstallation des paquets."
 
-#: dpkg-deb/main.c:191
+#: dpkg-deb/main.c:192
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "type de compression %s inconnu"
@@ -4549,7 +4544,7 @@ msgid "unable to exec mksplit"
 msgstr "impossible d'exécuter mksplit"
 
 #: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:16
-#: scripts/dpkg-statoverride.pl:20 scripts/install-info.pl:18
+#: scripts/dpkg-statoverride.pl:22 scripts/install-info.pl:18
 #: scripts/update-alternatives.pl:37
 #, fuzzy, perl-format
 msgid "Debian %s version %s.\n"
@@ -4563,7 +4558,7 @@ msgid ""
 msgstr "Copyright (C) 1994-1996 Ian Jackson.\n"
 
 #: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:22
-#: scripts/dpkg-statoverride.pl:25 scripts/install-info.pl:23
+#: scripts/dpkg-statoverride.pl:27 scripts/install-info.pl:23
 #: scripts/update-alternatives.pl:43
 #, fuzzy
 msgid ""
@@ -4589,7 +4584,7 @@ msgid ""
 "  --version    show the version.\n"
 msgstr ""
 
-#: scripts/cleanup-info.pl:66 scripts/install-info.pl:500
+#: scripts/cleanup-info.pl:66 scripts/install-info.pl:501
 #, fuzzy, perl-format
 msgid "%s: warning - unable to unlock %s: %s"
 msgstr "dpkg : avertissement - impossible d'analyser %s « %.250s » : %s\n"
@@ -4728,12 +4723,12 @@ msgstr "--%s a besoin d'au moins un nom de paquet comme param
 msgid "package may not contain newlines"
 msgstr "Le paquet « %s » ne contient aucun fichier (!)\n"
 
-#: scripts/dpkg-divert.pl:105 scripts/dpkg-statoverride.pl:72
+#: scripts/dpkg-divert.pl:105 scripts/dpkg-statoverride.pl:74
 #, fuzzy
 msgid "--admindir needs a directory argument"
 msgstr "--build a besoin d'un répertoire comme paramètre"
 
-#: scripts/dpkg-divert.pl:108 scripts/dpkg-statoverride.pl:84
+#: scripts/dpkg-divert.pl:108 scripts/dpkg-statoverride.pl:86
 #: scripts/update-alternatives.pl:145
 #, fuzzy, perl-format
 msgid "unknown option `%s'"
@@ -4764,7 +4759,7 @@ msgstr "--build a besoin d'un r
 msgid "filename \"%s\" is not absolute"
 msgstr "le conffile « %.250s » n'est pas testable (stattable)"
 
-#: scripts/dpkg-divert.pl:128 scripts/dpkg-statoverride.pl:116
+#: scripts/dpkg-divert.pl:128 scripts/dpkg-statoverride.pl:118
 msgid "file may not contain newlines"
 msgstr ""
 
@@ -4907,13 +4902,13 @@ msgstr ""
 msgid "internal error: %s corrupt: %s"
 msgstr "%s : erreur interne de gzip : écrit : « %s »"
 
-#: scripts/dpkg-statoverride.pl:22
+#: scripts/dpkg-statoverride.pl:24
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:33
+#: scripts/dpkg-statoverride.pl:35
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4933,123 +4928,123 @@ msgid ""
 "  --version                show the version.\n"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:91
+#: scripts/dpkg-statoverride.pl:93
 msgid "no mode specified"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:95
+#: scripts/dpkg-statoverride.pl:97
 #, fuzzy
 msgid "--add needs four arguments"
 msgstr "--build a besoin d'un répertoire comme paramètre"
 
-#: scripts/dpkg-statoverride.pl:100
+#: scripts/dpkg-statoverride.pl:102
 #, perl-format
 msgid "illegal user %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:102
+#: scripts/dpkg-statoverride.pl:104
 #, perl-format
 msgid "non-existing user %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:108
+#: scripts/dpkg-statoverride.pl:110
 #, perl-format
 msgid "illegal group %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:110
+#: scripts/dpkg-statoverride.pl:112
 #, perl-format
 msgid "non-existing group %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:114
+#: scripts/dpkg-statoverride.pl:116
 #, perl-format
 msgid "illegal mode %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:117 scripts/dpkg-statoverride.pl:144
-#: scripts/dpkg-statoverride.pl:163
+#: scripts/dpkg-statoverride.pl:119 scripts/dpkg-statoverride.pl:146
+#: scripts/dpkg-statoverride.pl:165
 msgid "stripping trailing /"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:120
+#: scripts/dpkg-statoverride.pl:122
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:122
+#: scripts/dpkg-statoverride.pl:124
 msgid "but --force specified so lets ignore it."
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:126
 #, fuzzy
 msgid "aborting"
 msgstr "avertissement"
 
-#: scripts/dpkg-statoverride.pl:135
+#: scripts/dpkg-statoverride.pl:137
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:137
+#: scripts/dpkg-statoverride.pl:139
 #, fuzzy, perl-format
 msgid "failed to chown %s: %s"
 msgstr "l'exécution de %s (%.250s) a échoué"
 
-#: scripts/dpkg-statoverride.pl:138
+#: scripts/dpkg-statoverride.pl:140
 #, fuzzy, perl-format
 msgid "failed to chmod %s: %s"
 msgstr "échec de l'exécution de « %s »"
 
-#: scripts/dpkg-statoverride.pl:142
+#: scripts/dpkg-statoverride.pl:144
 #, fuzzy
 msgid "--remove needs one arguments"
 msgstr "--%s ne prend pas de paramètre"
 
-#: scripts/dpkg-statoverride.pl:146
+#: scripts/dpkg-statoverride.pl:148
 msgid "No override present."
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:154
+#: scripts/dpkg-statoverride.pl:156
 msgid "warning: --update is useless for --remove"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:180
+#: scripts/dpkg-statoverride.pl:182
 #, fuzzy, perl-format
 msgid "cannot open statoverride: %s"
 msgstr "impossible d'ouvrir fichier des permissions (statoverride)"
 
-#: scripts/dpkg-statoverride.pl:186
+#: scripts/dpkg-statoverride.pl:188
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:199
+#: scripts/dpkg-statoverride.pl:201
 #, fuzzy, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr "impossible d'ouvrir fichier des permissions (statoverride)"
 
-#: scripts/dpkg-statoverride.pl:206
+#: scripts/dpkg-statoverride.pl:208
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:208
+#: scripts/dpkg-statoverride.pl:210
 #, fuzzy, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr "erreur pendant la création du périphérique « %.255s »"
 
-#: scripts/dpkg-statoverride.pl:210
+#: scripts/dpkg-statoverride.pl:212
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:214 scripts/dpkg-statoverride.pl:215
+#: scripts/dpkg-statoverride.pl:216 scripts/dpkg-statoverride.pl:217
 #, fuzzy, perl-format
 msgid "dpkg-statoverride: %s"
 msgstr "le fichier des permissions « %.250s »"
 
-#: scripts/dpkg-statoverride.pl:215
+#: scripts/dpkg-statoverride.pl:217
 msgid "You need --help."
 msgstr ""
 
@@ -5166,112 +5161,112 @@ msgstr ""
 msgid "try deleting %s?"
 msgstr ""
 
-#: scripts/install-info.pl:312
+#: scripts/install-info.pl:313
 #, perl-format
 msgid "open %s: %s"
 msgstr ""
 
-#: scripts/install-info.pl:314
+#: scripts/install-info.pl:315
 #, fuzzy, perl-format
 msgid "read %s: %s"
 msgstr "détourné par %s vers : %s\n"
 
-#: scripts/install-info.pl:315
+#: scripts/install-info.pl:316
 #, fuzzy, perl-format
 msgid "close %s after read: %s"
 msgstr "échec de la fermeture après lecture : « %.255s »"
 
-#: scripts/install-info.pl:347
+#: scripts/install-info.pl:348
 #, perl-format
 msgid "%s: existing entry for `%s' not replaced"
 msgstr ""
 
-#: scripts/install-info.pl:350
+#: scripts/install-info.pl:351
 #, perl-format
 msgid "%s: replacing existing dir entry for `%s'"
 msgstr ""
 
-#: scripts/install-info.pl:363
+#: scripts/install-info.pl:364
 #, fuzzy, perl-format
 msgid "%s: creating new section `%s'"
 msgstr "erreur pendant la création du répertoire « %.255s »"
 
-#: scripts/install-info.pl:366
+#: scripts/install-info.pl:367
 #, perl-format
 msgid "%s: no sections yet, creating Miscellaneous section too."
 msgstr ""
 
-#: scripts/install-info.pl:384
+#: scripts/install-info.pl:385
 #, perl-format
 msgid "%s: no section specified for new entry, placing at end"
 msgstr ""
 
-#: scripts/install-info.pl:421
+#: scripts/install-info.pl:422
 #, perl-format
 msgid "%s: deleting entry `%s ...'"
 msgstr ""
 
-#: scripts/install-info.pl:427
+#: scripts/install-info.pl:428
 #, perl-format
 msgid "%s: empty section `%s' not removed"
 msgstr ""
 
-#: scripts/install-info.pl:430
+#: scripts/install-info.pl:431
 #, perl-format
 msgid "%s: deleting empty section `%s'"
 msgstr ""
 
-#: scripts/install-info.pl:437
+#: scripts/install-info.pl:438
 #, perl-format
 msgid "%s: no entry for file `%s' and menu entry `%s'"
 msgstr ""
 
-#: scripts/install-info.pl:439
+#: scripts/install-info.pl:440
 #, fuzzy, perl-format
 msgid "%s: no entry for file `%s'"
 msgstr "copie le fichier d'info « %.255s »"
 
-#: scripts/install-info.pl:481
+#: scripts/install-info.pl:482
 #, perl-format
 msgid "create %s: %s"
 msgstr ""
 
-#: scripts/install-info.pl:483
+#: scripts/install-info.pl:484
 #, perl-format
 msgid "write %s: %s"
 msgstr ""
 
-#: scripts/install-info.pl:484
+#: scripts/install-info.pl:485
 #, perl-format
 msgid "close %s: %s"
 msgstr ""
 
-#: scripts/install-info.pl:488
+#: scripts/install-info.pl:489
 #, perl-format
 msgid "cannot backup old %s, giving up: %s"
 msgstr ""
 
-#: scripts/install-info.pl:490
+#: scripts/install-info.pl:491
 #, perl-format
 msgid "install new %s: %s"
 msgstr ""
 
-#: scripts/install-info.pl:493
+#: scripts/install-info.pl:494
 #, perl-format
 msgid "%s: unlock %s: %s"
 msgstr ""
 
-#: scripts/install-info.pl:495
+#: scripts/install-info.pl:496
 #, fuzzy, perl-format
 msgid "%s: couldn't backup %s in %s: %s"
 msgstr "impossible d'ouvrir le fichier de journal « %s » : %s\n"
 
-#: scripts/install-info.pl:507
+#: scripts/install-info.pl:508
 #, perl-format
 msgid "%s: read %s: %d"
 msgstr ""
 
-#: scripts/install-info.pl:511
+#: scripts/install-info.pl:512
 #, perl-format
 msgid "dbg: %s"
 msgstr ""
@@ -5681,3 +5676,6 @@ msgstr ""
 #, perl-format
 msgid "Serious problem: %s"
 msgstr ""
+
+#~ msgid "version a has bad syntax: %s\n"
+#~ msgstr "mauvaise syntaxe de la version « a » : %s\n"
diff --git a/po/gl.po b/po/gl.po
index d2a51e89..a63867d2 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-31 06:03+0300\n"
+"POT-Creation-Date: 2006-06-02 03:58+0300\n"
 "PO-Revision-Date: 2006-05-27 20:13+0200\n"
 "Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -2425,16 +2425,16 @@ msgstr ""
 "\"."
 
 #: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
-#, c-format
-msgid "conflicting actions --%s and --%s"
+#, fuzzy, c-format
+msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "as accións --%s e --%s teñen un conflicto"
 
-#: src/main.c:211
+#: src/main.c:212
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Aviso: opción \"--%s\" obsoleta\n"
 
-#: src/main.c:219
+#: src/main.c:220
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2472,29 +2472,29 @@ msgstr ""
 "As opcións de depuración mestúranse empregando a operación \"OR\" binaria.\n"
 "Teña en conta que os significados e valores poden cambiar.\n"
 
-#: src/main.c:240
+#: src/main.c:241
 msgid "--debug requires an octal argument"
 msgstr "--debug precisa dun argumento octal"
 
-#: src/main.c:264
+#: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "nome de paquete nulo na lista separada por comas de --ignore-depends \"%.250s"
 "\""
 
-#: src/main.c:270
+#: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends precisa dun nome válido de paquete. \"%.250s\" non o é; %s"
 
-#: src/main.c:286 src/main.c:297
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "número enteiro non válido para --%s: \"%.250s\""
 
-#: src/main.c:317
+#: src/main.c:318
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2569,53 +2569,53 @@ msgstr ""
 "AVISO - o emprego das opcións marcadas [!] pode danar gravemente a súa\n"
 "instalación. O forzado das opcións marcadas [*] está activado por defecto.\n"
 
-#: src/main.c:362
+#: src/main.c:363
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "opción de forzar/rexeitar \"%.*s\" descoñecida"
 
-#: src/main.c:367
+#: src/main.c:368
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Aviso: opción de forzado/rexeitado \"%s\" obsoleta\n"
 
-#: src/main.c:490 src/main.c:500 src/main.c:508
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr "non se puido facer malloc en execbackend"
 
-#: src/main.c:494 src/main.c:517
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr "non se puido facer strdup en execbackend"
 
-#: src/main.c:522
+#: src/main.c:523
 #, c-format
 msgid "failed to exec %s"
 msgstr "non se puido executar %s"
 
-#: src/main.c:537
+#: src/main.c:538
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd toma un argumento, non cero"
 
-#: src/main.c:539
+#: src/main.c:540
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd só toma un argumento"
 
-#: src/main.c:541
+#: src/main.c:542
 msgid "invalid number for --command-fd"
 msgstr "número non válido para --command-fd"
 
-#: src/main.c:543
+#: src/main.c:544
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "non se puido abrir \"%i\" para fluxo"
 
-#: src/main.c:568
+#: src/main.c:569
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "fin de ficheiro inesperada antes da fin da liña %d"
 
-#: src/main.c:612 src/main.c:627 src/query.c:579 dpkg-deb/main.c:199
-#: dpkg-split/main.c:169
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "precísase dunha opción de acción"
 
@@ -3990,7 +3990,7 @@ msgstr ""
 "Escriba dpkg --help para axuda sobre instalación e desinstalación de "
 "paquetes."
 
-#: dpkg-deb/main.c:191
+#: dpkg-deb/main.c:192
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "tipo de compresión \"%s\" descoñecido"
diff --git a/po/hu.po b/po/hu.po
index e8e0ca27..cf00d931 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-31 06:03+0300\n"
+"POT-Creation-Date: 2006-06-02 03:58+0300\n"
 "PO-Revision-Date: 2006-05-27 23:17+0100\n"
 "Last-Translator: SZERVÑC Attila <sas@321.hu>\n"
 "Language-Team: hu\n"
@@ -2277,16 +2277,16 @@ msgstr ""
 "`less' vagy `more' parancson keresztül!"
 
 #: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
-#, c-format
-msgid "conflicting actions --%s and --%s"
+#, fuzzy, c-format
+msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "ütköző műveletek --%s és --%s"
 
-#: src/main.c:211
+#: src/main.c:212
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Figyelem: elavult lehetőség `--%s'\n"
 
-#: src/main.c:219
+#: src/main.c:220
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2307,28 +2307,28 @@ msgid ""
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:240
+#: src/main.c:241
 msgid "--debug requires an octal argument"
 msgstr "a --debug egy oktális argumentumot igényel"
 
-#: src/main.c:264
+#: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "nincs csomagnév az --ignore-depends vesszővel elválasztott listájában: `"
 "%.250s'"
 
-#: src/main.c:270
+#: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr "Az --ignore-depends helyes csomagnevet követel. `%.250s' nem az; %s"
 
-#: src/main.c:286 src/main.c:297
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "érvénytelem egész a --%s számára: `%.250s'"
 
-#: src/main.c:317
+#: src/main.c:318
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2368,53 +2368,53 @@ msgid ""
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:362
+#: src/main.c:363
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "ismeretlen `%.*s' kényszerítő/elutasító opció"
 
-#: src/main.c:367
+#: src/main.c:368
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Figyelem: elavult `--%s' kényszerítő/elutasító opció\n"
 
-#: src/main.c:490 src/main.c:500 src/main.c:508
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr "sikertelen malloc az execbackend-ben"
 
-#: src/main.c:494 src/main.c:517
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr "sikertelen strdup az execbackend-ben"
 
-#: src/main.c:522
+#: src/main.c:523
 #, c-format
 msgid "failed to exec %s"
 msgstr "sikertelen futtatás: %s"
 
-#: src/main.c:537
+#: src/main.c:538
 msgid "--command-fd takes one argument, not zero"
 msgstr "a --command-fd 1 argumentumot vár"
 
-#: src/main.c:539
+#: src/main.c:540
 msgid "--command-fd only takes one argument"
 msgstr "a --command-fd csak 1 argumentumot vár"
 
-#: src/main.c:541
+#: src/main.c:542
 msgid "invalid number for --command-fd"
 msgstr "érvénytelen szám a --command-fd számára"
 
-#: src/main.c:543
+#: src/main.c:544
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "`%i' nem nyitható meg az áramoltatásra"
 
-#: src/main.c:568
+#: src/main.c:569
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "váratlan eof e sor vége előtt: %d"
 
-#: src/main.c:612 src/main.c:627 src/query.c:579 dpkg-deb/main.c:199
-#: dpkg-split/main.c:169
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "egy művelet opciót igényel"
 
@@ -3687,7 +3687,7 @@ msgstr ""
 "A dpkg-deb --help súg a *.deb fájlok kezeléséről;\n"
 "A dpkg --help súg csomagok telepítéséről/eltávolításáról dpkg-val."
 
-#: dpkg-deb/main.c:191
+#: dpkg-deb/main.c:192
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "ismeretlen tömörítés: `%s'!"
diff --git a/po/id.po b/po/id.po
index 4425c42f..f80704e1 100644
--- a/po/id.po
+++ b/po/id.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-31 06:03+0300\n"
+"POT-Creation-Date: 2006-06-02 03:58+0300\n"
 "PO-Revision-Date: 2006-02-17 08:52+0200\n"
 "Last-Translator: Parlin Imanuel <parlin_i@yahoo.com>\n"
 "Language-Team: Debian Indonesia L10N Team <debian-l10n-id@gurame.fisika.ui."
@@ -2322,16 +2322,16 @@ msgstr ""
 "atau `more'!"
 
 #: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
-#, c-format
-msgid "conflicting actions --%s and --%s"
+#, fuzzy, c-format
+msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "aksi --%s dan --%s berbenturan"
 
-#: src/main.c:211
+#: src/main.c:212
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "PERINGATAN: pilihan '--%s' sudah usang \n"
 
-#: src/main.c:219
+#: src/main.c:220
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2369,27 +2369,27 @@ msgstr ""
 "Pilihan-pilihan debug akan saling dipadukan dengan operasi 'bit or'.\n"
 "Ingat bahwa arti dan nilai di atas bisa saja berubah.\n"
 
-#: src/main.c:240
+#: src/main.c:241
 msgid "--debug requires an octal argument"
 msgstr "--debug membutuhkan sebuah argumen oktal"
 
-#: src/main.c:264
+#: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr "nama paket nihil dalam daftar terpisah-koma --ignore-depends `%.250s'"
 
-#: src/main.c:270
+#: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends memerlukan sebuah nama paket yang sah. `%.250s' tidak; %s"
 
-#: src/main.c:286 src/main.c:297
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "integer untuk --%s tidak sah: `%.250s'"
 
-#: src/main.c:317
+#: src/main.c:318
 #, fuzzy, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2467,55 +2467,55 @@ msgstr ""
 "parah.\n"
 "Pilihan paksaan bertanda [*] akan langsung diaktifkan.\n"
 
-#: src/main.c:362
+#: src/main.c:363
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "Pilihan force/refuse `%.*s' tak dikenal"
 
-#: src/main.c:367
+#: src/main.c:368
 #, fuzzy, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "PERINGATAN: pilihan '--%s' sudah usang \n"
 
-#: src/main.c:490 src/main.c:500 src/main.c:508
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr "tidak dapat melakukan 'malloc' pada 'execbackend'"
 
-#: src/main.c:494 src/main.c:517
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr "tidak dapat melakukan 'strdup' pada 'execbackend'"
 
-#: src/main.c:522
+#: src/main.c:523
 #, c-format
 msgid "failed to exec %s"
 msgstr "Gagal menjalankan perintah %s"
 
-#: src/main.c:537
+#: src/main.c:538
 #, fuzzy
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd butuh 1 argumen, bukan 0"
 
-#: src/main.c:539
+#: src/main.c:540
 #, fuzzy
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd hanya butuh 1 argumen"
 
-#: src/main.c:541
+#: src/main.c:542
 msgid "invalid number for --command-fd"
 msgstr "angka tidak sah untuk --command-fd"
 
-#: src/main.c:543
+#: src/main.c:544
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "tidak dapat membuka `%i' untuk stream"
 
-#: src/main.c:568
+#: src/main.c:569
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "eof tidak diharapkan sebelum akhir baris %d"
 
-#: src/main.c:612 src/main.c:627 src/query.c:579 dpkg-deb/main.c:199
-#: dpkg-split/main.c:169
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "butuh suatu pilihan aksi"
 
@@ -3827,7 +3827,7 @@ msgstr ""
 "Ketik dpkg-deb --help untuk panduan dalam manipulasi berkas *.deb;\n"
 "Ketik dpkg --help untuk panduan dalam pemasangan dan pembuangan paket."
 
-#: dpkg-deb/main.c:191
+#: dpkg-deb/main.c:192
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "jenis kompresi `%s' tidak dikenal!"
diff --git a/po/it.po b/po/it.po
index 1dfbd423..3ca4d045 100644
--- a/po/it.po
+++ b/po/it.po
@@ -40,7 +40,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.10.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-31 06:03+0300\n"
+"POT-Creation-Date: 2006-06-02 03:58+0300\n"
 "PO-Revision-Date: 2006-03-02 12:24+0100\n"
 "Last-Translator: Stefano Canepa <sc@linux.it>\n"
 "Language-Team: italian <debian-l10n-italian@debian.org>\n"
@@ -2393,16 +2393,16 @@ msgstr ""
 "`less' o `more' per leggerlo!"
 
 #: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
-#, c-format
-msgid "conflicting actions --%s and --%s"
+#, fuzzy, c-format
+msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "le azioni --%s e --%s sono in conflitto"
 
-#: src/main.c:211
+#: src/main.c:212
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Attenzione: opzione obsoleta `--%s'\n"
 
-#: src/main.c:219
+#: src/main.c:220
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2439,29 +2439,29 @@ msgstr ""
 "Debugging options are be mixed using bitwise-or.\n"
 "Note that the meanings and values are subject to change.\n"
 
-#: src/main.c:240
+#: src/main.c:241
 msgid "--debug requires an octal argument"
 msgstr "--debug richiede un numero in base otto come parametro"
 
-#: src/main.c:264
+#: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "uno dei nomi di pacchetto separati da virgole nella lista data a --ignore-"
 "depends `%.250s' è nullo"
 
-#: src/main.c:270
+#: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends richiede un nome di pacchetto legale. `%.250s' non lo è; %s"
 
-#: src/main.c:286 src/main.c:297
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "numero intero non valido per l'opzione --%s: `%.250s'"
 
-#: src/main.c:317
+#: src/main.c:318
 #, fuzzy, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2549,55 +2549,55 @@ msgstr ""
 "seriamente la vostra installazione.\n"
 "Le opzioni contrassegnate da [*] sono abilitate di default.\n"
 
-#: src/main.c:362
+#: src/main.c:363
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "opzione force/refuse sconosciuta: `%.*s'"
 
-#: src/main.c:367
+#: src/main.c:368
 #, fuzzy, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Attenzione: opzione obsoleta `--%s'\n"
 
-#: src/main.c:490 src/main.c:500 src/main.c:508
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr "impossibile fare malloc in execbackend"
 
-#: src/main.c:494 src/main.c:517
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr "impossibile fare strdup in execbackend"
 
-#: src/main.c:522
+#: src/main.c:523
 #, c-format
 msgid "failed to exec %s"
 msgstr "impossibile eseguire %s"
 
-#: src/main.c:537
+#: src/main.c:538
 #, fuzzy
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd accetta un parametro, non nessuno"
 
-#: src/main.c:539
+#: src/main.c:540
 #, fuzzy
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd accetta un solo parametro"
 
-#: src/main.c:541
+#: src/main.c:542
 msgid "invalid number for --command-fd"
 msgstr "numero non valido in --command-fd"
 
-#: src/main.c:543
+#: src/main.c:544
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "impossibile aprire `%i' per ricevere il flusso"
 
-#: src/main.c:568
+#: src/main.c:569
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "eof inaspettato prima della fine della linea %d"
 
-#: src/main.c:612 src/main.c:627 src/query.c:579 dpkg-deb/main.c:199
-#: dpkg-split/main.c:169
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "è necessaria una opzione che indichi che azione svolgere"
 
@@ -3954,7 +3954,7 @@ msgstr ""
 "Usa dpkg-deb --help per un aiuto sulla manipolazione dei file *.deb;\n"
 "Usa dpkg --help per un aiuto sull'installazione e rimozione dei pacchetti."
 
-#: dpkg-deb/main.c:191
+#: dpkg-deb/main.c:192
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "tipo di compressione sconosciuto `%s'!"
diff --git a/po/ja.po b/po/ja.po
index ea71ed9a..fb38806f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-31 06:03+0300\n"
+"POT-Creation-Date: 2006-06-02 03:58+0300\n"
 "PO-Revision-Date: 2006-04-29 21:22+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Debian Japanease List <debian-japanese@lists.debian.org>\n"
@@ -2338,16 +2338,16 @@ msgstr ""
 "ください!"
 
 #: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
-#, c-format
-msgid "conflicting actions --%s and --%s"
+#, fuzzy, c-format
+msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "アクション --%s と --%s が競合します"
 
-#: src/main.c:211
+#: src/main.c:212
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "警告: 時代遅れのオプション `--%s'\n"
 
-#: src/main.c:219
+#: src/main.c:220
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2384,29 +2384,29 @@ msgstr ""
 "デバッグオプションはビットごとの OR 演算で混合されます。\n"
 "その意味や値は変更されることに注意してください。\n"
 
-#: src/main.c:240
+#: src/main.c:241
 msgid "--debug requires an octal argument"
 msgstr "--debug は 8 進数の引数がひとつ必要です。"
 
-#: src/main.c:264
+#: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "--ignore-depends の引数 (コンマで区切られたリスト) `%.250s' に空のパッケージ"
 "名"
 
-#: src/main.c:270
+#: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends は正当なパッケージ名を必要とします。`%.250s' は不正です; %s"
 
-#: src/main.c:286 src/main.c:297
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "--%s に対する不正な整数です: `%.250s'"
 
-#: src/main.c:317
+#: src/main.c:318
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2478,55 +2478,55 @@ msgstr ""
 "警告: [!] のあるオプションを使用すると、インストール時に深刻なダメージを\n"
 "受ける場合がある。[*] の付いたオプションはデフォルトで有効。\n"
 
-#: src/main.c:362
+#: src/main.c:363
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "不明な強制・拒否 (force/refuse) オプション `%.*s'"
 
-#: src/main.c:367
+#: src/main.c:368
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "警告: 時代遅れの強制・拒否 (force/refuse) オプション `%s'\n"
 
-#: src/main.c:490 src/main.c:500 src/main.c:508
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr "バックエンドの実行で malloc に失敗しました"
 
-#: src/main.c:494 src/main.c:517
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr "バックエンドの実行で strdup に失敗しました"
 
-#: src/main.c:522
+#: src/main.c:523
 #, c-format
 msgid "failed to exec %s"
 msgstr "%s の実行に失敗しました"
 
-#: src/main.c:537
+#: src/main.c:538
 #, fuzzy
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd は 1 つの引数をとります"
 
-#: src/main.c:539
+#: src/main.c:540
 #, fuzzy
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd は引数を 1 つだけ引数をとります"
 
-#: src/main.c:541
+#: src/main.c:542
 msgid "invalid number for --command-fd"
 msgstr "--command-fd への値が不正です"
 
-#: src/main.c:543
+#: src/main.c:544
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "`%i' をストリームとしてオープンできませんでした"
 
-#: src/main.c:568
+#: src/main.c:569
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "%d 行目の行末までに予期しない eof があります"
 
-#: src/main.c:612 src/main.c:627 src/query.c:579 dpkg-deb/main.c:199
-#: dpkg-split/main.c:169
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "アクションを指定するオプションが必要です"
 
@@ -3857,7 +3857,7 @@ msgstr ""
 "*.deb ファイルの操作についてのヘルプは dpkg-deb --help を参照;\n"
 "パッケージのインストール、削除については dpkg --help を参照。"
 
-#: dpkg-deb/main.c:191
+#: dpkg-deb/main.c:192
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "`%s' は不明な圧縮形式です!"
diff --git a/po/ko.po b/po/ko.po
index 66145d69..ad813fb9 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-31 06:03+0300\n"
+"POT-Creation-Date: 2006-06-02 03:58+0300\n"
 "PO-Revision-Date: 2006-02-17 08:52+0200\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <cwryu@debian.org>\n"
@@ -2307,16 +2307,16 @@ msgstr ""
 "시오!"
 
 #: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
-#, c-format
-msgid "conflicting actions --%s and --%s"
+#, fuzzy, c-format
+msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "--%s 명령과 --%s 명령은 충돌합니다"
 
-#: src/main.c:211
+#: src/main.c:212
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "경고: `--%s' 옵션은 더 이상 사용하지 않습니다\n"
 
-#: src/main.c:219
+#: src/main.c:220
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2353,30 +2353,30 @@ msgstr ""
 "디버깅 옵션은 OR 비트 연산으로 조합합니다.\n"
 "각각의 의미와 값은 향후 바뀔 수 있습니다.\n"
 
-#: src/main.c:240
+#: src/main.c:241
 msgid "--debug requires an octal argument"
 msgstr "--debug 옵션에는 8진수 인수가 필요합니다"
 
-#: src/main.c:264
+#: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "--ignore-depends 옵션의 (쉼표로 구분한) 목록에 (`%.250s') 꾸러미 이름이 없습"
 "니다"
 
-#: src/main.c:270
+#: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends 옵션에는 올바른 꾸러미 이름이 필요합니다. `%.250s' 꾸러미는 "
 "올바르지 않습니다: %s"
 
-#: src/main.c:286 src/main.c:297
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "--%s 옵션에 숫자가 잘못되었습니다: `%.250s'"
 
-#: src/main.c:317
+#: src/main.c:318
 #, fuzzy, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2446,56 +2446,56 @@ msgstr ""
 "경고 - [!]가 붙은 옵션을 사용하면 설치 상태를 심각하게 망가질 수 있습니다.\n"
 "[*]가 표시된 강제 옵션은 기본값으로 켜집니다.\n"
 
-#: src/main.c:362
+#: src/main.c:363
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "알 수 없는 force/refuse 옵션 `%.*s'"
 
-#: src/main.c:367
+#: src/main.c:368
 #, fuzzy, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "경고: `--%s' 옵션은 더 이상 사용하지 않습니다\n"
 
-#: src/main.c:490 src/main.c:500 src/main.c:508
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr "execbackend에서 malloc할 수 없습니다"
 
-#: src/main.c:494 src/main.c:517
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr "execbackend에서 strdup할 수 없습니다"
 
-#: src/main.c:522
+#: src/main.c:523
 #, c-format
 msgid "failed to exec %s"
 msgstr "%s 실행이 실패했습니다"
 
-#: src/main.c:537
+#: src/main.c:538
 #, fuzzy
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd 옵션은 0개가 아니라 1개의 인수를 받습니다"
 
-#: src/main.c:539
+#: src/main.c:540
 #, fuzzy
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd 옵션은 정확히 1개의 인수만 받습니다"
 
-#: src/main.c:541
+#: src/main.c:542
 msgid "invalid number for --command-fd"
 msgstr "--command-fd 옵션에 번호가 올바르지 않습니다"
 
 # fdopen() 실패 상황
-#: src/main.c:543
+#: src/main.c:544
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "`%i' 파일디스크립터를 스트림으로 열 수 없습니다"
 
-#: src/main.c:568
+#: src/main.c:569
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "%d번째 줄이 끝나기 전에 예상치 못하게 파일이 끝났습니다"
 
-#: src/main.c:612 src/main.c:627 src/query.c:579 dpkg-deb/main.c:199
-#: dpkg-split/main.c:169
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "명령 옵션이 필요합니다"
 
@@ -3807,7 +3807,7 @@ msgstr ""
 "*.deb 파일 조작에 관한 도움말을 보려면 dpkg-deb --help를 실행하십시오.\n"
 "꾸러미 설치와 설치 해제에 관한 도움말을 보려면 dpkg --help를 실행하십시오."
 
-#: dpkg-deb/main.c:191
+#: dpkg-deb/main.c:192
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "알 수 없는 압축 종류 `%s'!"
diff --git a/po/nb.po b/po/nb.po
index 2a4b0a54..236a4a3d 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-31 06:03+0300\n"
+"POT-Creation-Date: 2006-06-02 03:58+0300\n"
 "PO-Revision-Date: 2006-02-17 08:52+0200\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.ui.no>\n"
@@ -2309,16 +2309,16 @@ msgstr ""
 "informasjonen!"
 
 #: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
-#, c-format
-msgid "conflicting actions --%s and --%s"
+#, fuzzy, c-format
+msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "handlinger i konflikt --%s og --%s"
 
-#: src/main.c:211
+#: src/main.c:212
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Advarsel: Foreldet opsjon  «%s»\n"
 
-#: src/main.c:219
+#: src/main.c:220
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2357,27 +2357,27 @@ msgstr ""
 "Avlusingsopsjonene kan kombineres med logisk eller.\n"
 "Legg merke til at betydninger og verdier kan bli endret.\n"
 
-#: src/main.c:240
+#: src/main.c:241
 msgid "--debug requires an octal argument"
 msgstr "-- debug krever en oktal parameter"
 
-#: src/main.c:264
+#: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr "tomt pakkenavn i den kommadelte lista til --ignore-depends «%.250s»"
 
-#: src/main.c:270
+#: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends krever et gyldig pakkenavn. «%.250s» er ikke gyldig; %s"
 
-#: src/main.c:286 src/main.c:297
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "ugyldig heltall for --%s: «%.250s»"
 
-#: src/main.c:317
+#: src/main.c:318
 #, fuzzy, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2452,55 +2452,55 @@ msgstr ""
 "ADVARSEL - Funksjoner merket med [!] kan ødelegge installasjonen alvorlig.\n"
 "Opsjoner som er merket med [*] er slått på som standard.\n"
 
-#: src/main.c:362
+#: src/main.c:363
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "ukjent tvangs-/avvisningsopsjon «%.*s»"
 
-#: src/main.c:367
+#: src/main.c:368
 #, fuzzy, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Advarsel: Foreldet opsjon  «%s»\n"
 
-#: src/main.c:490 src/main.c:500 src/main.c:508
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr "klarte ikke utføre «malloc» i execbackend"
 
-#: src/main.c:494 src/main.c:517
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr "klarte ikke utføre «strdup» i execbackend"
 
-#: src/main.c:522
+#: src/main.c:523
 #, c-format
 msgid "failed to exec %s"
 msgstr "klarte ikke kjøre %s"
 
-#: src/main.c:537
+#: src/main.c:538
 #, fuzzy
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd tar ett argument, ikke 0"
 
-#: src/main.c:539
+#: src/main.c:540
 #, fuzzy
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd tar bare ett argument"
 
-#: src/main.c:541
+#: src/main.c:542
 msgid "invalid number for --command-fd"
 msgstr "ugyldig tall for --command-fd"
 
-#: src/main.c:543
+#: src/main.c:544
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "klarte ikke åpne «%i» for strøm"
 
-#: src/main.c:568
+#: src/main.c:569
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "uventet slutt på fil før slutten av linje %d"
 
-#: src/main.c:612 src/main.c:627 src/query.c:579 dpkg-deb/main.c:199
-#: dpkg-split/main.c:169
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "trenger et handlingsvalg"
 
@@ -3804,7 +3804,7 @@ msgstr ""
 "Skriv «dpkg-deb --help» for hjelp med endring av *.deb-filer.\n"
 "Skriv «dpkg --help» for hjelp med å installere og avinstallere pakker."
 
-#: dpkg-deb/main.c:191
+#: dpkg-deb/main.c:192
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "ukjent koprimeringstype «%s»!"
diff --git a/po/nl.po b/po/nl.po
index e85164ad..1490bb5d 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.9.4\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-31 06:03+0300\n"
+"POT-Creation-Date: 2006-06-02 03:58+0300\n"
 "PO-Revision-Date: 2006-05-04 10:23+0100\n"
 "Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
 "Language-Team: Dutch <debian-l10n-dutch@debian.org>\n"
@@ -2408,16 +2408,16 @@ msgstr ""
 "of `more' !"
 
 #: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
-#, c-format
-msgid "conflicting actions --%s and --%s"
+#, fuzzy, c-format
+msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "tegenstrijdige acties --%s en --%s"
 
-#: src/main.c:211
+#: src/main.c:212
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Let op: verouderde optie `--%s'\n"
 
-#: src/main.c:219
+#: src/main.c:220
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2454,28 +2454,28 @@ msgstr ""
 "Debug-opties kunnen worden gecombineerd met bitsgewijze of.\n"
 "Merk op dat de betekenissen en waarden kunnen veranderen.\n"
 
-#: src/main.c:240
+#: src/main.c:241
 msgid "--debug requires an octal argument"
 msgstr "--debug vereist een octaal argument"
 
-#: src/main.c:264
+#: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "lege pakketnaam in --ignore-depends lijst `%.250s' (gescheiden door komma's)"
 
-#: src/main.c:270
+#: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends vereist een toegestane pakketnaam. `%.250s' is dat niet; %s"
 
-#: src/main.c:286 src/main.c:297
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "ongeldig getal voor --%s: `%.250s'"
 
-#: src/main.c:317
+#: src/main.c:318
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2559,53 +2559,53 @@ msgstr ""
 "ernstig beschadigen.\n"
 "Forceeropties gemarkeerd met [*] staan standaard aan.\n"
 
-#: src/main.c:362
+#: src/main.c:363
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "onbekende force/refuse optie `%.*s'"
 
-#: src/main.c:367
+#: src/main.c:368
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Let op: verouderde forceer/weiger optie `%s'\n"
 
-#: src/main.c:490 src/main.c:500 src/main.c:508
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr "kon geen geheugen reserveren in exec-backend"
 
-#: src/main.c:494 src/main.c:517
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr "strdup is mislukt in exec-backend"
 
-#: src/main.c:522
+#: src/main.c:523
 #, c-format
 msgid "failed to exec %s"
 msgstr "kon %s niet uitvoeren"
 
-#: src/main.c:537
+#: src/main.c:538
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd aanvaard slechts één argument, en dat mag niet nul zijn"
 
-#: src/main.c:539
+#: src/main.c:540
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd aanvaard slechts één argument"
 
-#: src/main.c:541
+#: src/main.c:542
 msgid "invalid number for --command-fd"
 msgstr "ongeldig nummer voor --command-fd"
 
-#: src/main.c:543
+#: src/main.c:544
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "kon `%i' niet openen voor stream"
 
-#: src/main.c:568
+#: src/main.c:569
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "onverwacht bestandseinde voor einde regel %d"
 
-#: src/main.c:612 src/main.c:627 src/query.c:579 dpkg-deb/main.c:199
-#: dpkg-split/main.c:169
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "heb een actie-optie nodig"
 
@@ -3935,7 +3935,7 @@ msgstr ""
 "Type dpkg-deb --help voor hulp bij manipuleren van *.deb bestanden;\n"
 "Type dpkg --help voor hulp bij installeren en verwijderen van pakketten."
 
-#: dpkg-deb/main.c:191
+#: dpkg-deb/main.c:192
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "onbekend compressietype '%s'!"
diff --git a/po/nn.po b/po/nn.po
index 2dac834c..844b41a7 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debconf_nn\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-31 06:03+0300\n"
+"POT-Creation-Date: 2006-06-02 03:58+0300\n"
 "PO-Revision-Date: 2006-02-17 08:52+0200\n"
 "Last-Translator: HÃ¥vard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -2320,16 +2320,16 @@ msgstr ""
 "informasjonen."
 
 #: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
-#, c-format
-msgid "conflicting actions --%s and --%s"
+#, fuzzy, c-format
+msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "handlingar i konflikt --%s og --%s"
 
-#: src/main.c:211
+#: src/main.c:212
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Åtvaring: Forelda val «%s»\n"
 
-#: src/main.c:219
+#: src/main.c:220
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2368,27 +2368,27 @@ msgstr ""
 "Avlusingsvala kan kombinerast med logisk eller.\n"
 "Legg merke til at tydingane og verdiane kan verta endra.\n"
 
-#: src/main.c:240
+#: src/main.c:241
 msgid "--debug requires an octal argument"
 msgstr "-- debug krev ein oktal parameter"
 
-#: src/main.c:264
+#: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr "tomt pakkenamn i den kommadelte lista til --ignore-depends «%.250s»"
 
-#: src/main.c:270
+#: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends krev eit gyldig pakkenamn. «%.250s» er ikkje gyldig; %s"
 
-#: src/main.c:286 src/main.c:297
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "ugyldig heiltal for --%s: «%.250s»"
 
-#: src/main.c:317
+#: src/main.c:318
 #, fuzzy, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2466,55 +2466,55 @@ msgstr ""
 "alvorleg.\n"
 "Vala som er merkte med [*] er slått på som standard.\n"
 
-#: src/main.c:362
+#: src/main.c:363
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "ukjend tvingings-/avvisingsval «%.*s»"
 
-#: src/main.c:367
+#: src/main.c:368
 #, fuzzy, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Åtvaring: Forelda val «%s»\n"
 
-#: src/main.c:490 src/main.c:500 src/main.c:508
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr "klarte ikkje utføra «malloc» i execbackend"
 
-#: src/main.c:494 src/main.c:517
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr "klarte ikkje utføra «strdup» i execbackend"
 
-#: src/main.c:522
+#: src/main.c:523
 #, c-format
 msgid "failed to exec %s"
 msgstr "klarte ikkje køyra %s"
 
-#: src/main.c:537
+#: src/main.c:538
 #, fuzzy
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd tek éin parameter, ikkje null"
 
-#: src/main.c:539
+#: src/main.c:540
 #, fuzzy
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd tek berre ein parameter"
 
-#: src/main.c:541
+#: src/main.c:542
 msgid "invalid number for --command-fd"
 msgstr "ugyldig tal for --command-fd"
 
-#: src/main.c:543
+#: src/main.c:544
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "klarte ikkje opna «%i» for straum"
 
-#: src/main.c:568
+#: src/main.c:569
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "uventa slutt på fil før slutten av linje %d"
 
-#: src/main.c:612 src/main.c:627 src/query.c:579 dpkg-deb/main.c:199
-#: dpkg-split/main.c:169
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "treng eit handlingsval"
 
@@ -3819,7 +3819,7 @@ msgstr ""
 "Skriv «dpkg-deb --help» for hjelp med endring av *.deb-filer.\n"
 "Skriv «dpkg --help» for hjelp med å installera og avinstallera pakkar."
 
-#: dpkg-deb/main.c:191
+#: dpkg-deb/main.c:192
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "ukjend komprimeringstype «%s»!"
diff --git a/po/pl.po b/po/pl.po
index 5cda91de..192b10b7 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13.19\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-31 06:03+0300\n"
+"POT-Creation-Date: 2006-06-02 03:58+0300\n"
 "PO-Revision-Date: 2006-05-04 22:54+0200\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <pddp@debian.linux.org.pl>\n"
@@ -2401,16 +2401,16 @@ msgstr ""
 "Opcje oznaczone [*] podaj± du¿o tre¶ci - skieruj potok na `less' lub `more'!"
 
 #: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
-#, c-format
-msgid "conflicting actions --%s and --%s"
+#, fuzzy, c-format
+msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "konflikt miêdzy dzia³aniem --%s i --%s"
 
-#: src/main.c:211
+#: src/main.c:212
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Uwaga: niewykorzystywana ju¿ opcja `--%s'\n"
 
-#: src/main.c:219
+#: src/main.c:220
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2448,28 +2448,28 @@ msgstr ""
 "Opcje debuggera mog± byæ ³±czone poprzez zsumowanie poszczególnych \n"
 " warto¶ci. Uwaga: znaczenia i warto¶ci opcji mog± siê zmieniæ!\n"
 
-#: src/main.c:240
+#: src/main.c:241
 msgid "--debug requires an octal argument"
 msgstr "--debug wymaga podania argumentu bêd±cego liczb± ósemkow±"
 
-#: src/main.c:264
+#: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr "pusta nazwa pakietu dla --ignore-depends w li¶cie `%.250s'"
 
-#: src/main.c:270
+#: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends wymaga podania poprawnej nazwy pakietu. `%.250s' jest "
 "niepoprawny; %s"
 
-#: src/main.c:286 src/main.c:297
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "b³êdna warto¶æ liczbowa dla --%s: `%.250s'"
 
-#: src/main.c:317
+#: src/main.c:318
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2544,53 +2544,53 @@ msgstr ""
 "UWAGA - u¿ycie opcji oznaczonej [!] mo¿e powa¿nie uszkodziæ instalacjê.\n"
 "Opcje oznaczone [*] s± domy¶lnie w³±czone.\n"
 
-#: src/main.c:362
+#: src/main.c:363
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "nieznana opcja force/refuse `%.*s'"
 
-#: src/main.c:367
+#: src/main.c:368
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Uwaga: niewykorzystywana ju¿ opcja force/refuse `%s'\n"
 
-#: src/main.c:490 src/main.c:500 src/main.c:508
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr "malloc w execbackend nie powiod³o siê"
 
-#: src/main.c:494 src/main.c:517
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr "strdup w execbackend nie powiod³o siê"
 
-#: src/main.c:522
+#: src/main.c:523
 #, c-format
 msgid "failed to exec %s"
 msgstr "wywo³anie %s nie powiod³o siê"
 
-#: src/main.c:537
+#: src/main.c:538
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd wymaga jednego argumentu, nie zero"
 
-#: src/main.c:539
+#: src/main.c:540
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd wymaga tylko jednego argumentu"
 
-#: src/main.c:541
+#: src/main.c:542
 msgid "invalid number for --command-fd"
 msgstr "nieprawid³owy numer przy --command-fd"
 
-#: src/main.c:543
+#: src/main.c:544
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "nie uda³o siê otworzyæ `%i' jako strumienia"
 
-#: src/main.c:568
+#: src/main.c:569
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "niespodziewany EOF przed koñcem linii %d"
 
-#: src/main.c:612 src/main.c:627 src/query.c:579 dpkg-deb/main.c:199
-#: dpkg-split/main.c:169
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "nale¿y okre¶liæ dzia³anie"
 
@@ -3934,7 +3934,7 @@ msgstr ""
 "Wpisz dpkg-deb --help, aby dowiedzieæ siê jak operowaæ plikami *.deb;\n"
 "Wpisz dpkg --help, aby dowiedzieæ siê jak (od)instalowaæ pakiety."
 
-#: dpkg-deb/main.c:191
+#: dpkg-deb/main.c:192
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "nieznany typ kompresji `%s'!"
diff --git a/po/pt.po b/po/pt.po
index 56750dd4..2c830aa2 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-31 06:03+0300\n"
+"POT-Creation-Date: 2006-06-02 03:58+0300\n"
 "PO-Revision-Date: 2006-04-10 21:47+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -2407,16 +2407,16 @@ msgstr ""
 "`less' ou `more' !"
 
 #: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
-#, c-format
-msgid "conflicting actions --%s and --%s"
+#, fuzzy, c-format
+msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "acções em conflito --%s e --%s"
 
-#: src/main.c:211
+#: src/main.c:212
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "aviso: opção obsoleta `--%s'\n"
 
-#: src/main.c:219
+#: src/main.c:220
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2454,29 +2454,29 @@ msgstr ""
 "Opções de debug são misturadas utilizando o bitwise-or.\n"
 "Note que os significados e valores estão sujeitos a mudar.\n"
 
-#: src/main.c:240
+#: src/main.c:241
 msgid "--debug requires an octal argument"
 msgstr "--debug requer um argumento em octal"
 
-#: src/main.c:264
+#: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "nome de pacote nulo na lista separada por virgulas de --ignore-depends`"
 "%.250s'"
 
-#: src/main.c:270
+#: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends requer um nome de pacote válido.  `%.250s' não o é; %s"
 
-#: src/main.c:286 src/main.c:297
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "número inteiro inválido para --%s: `%.250s'"
 
-#: src/main.c:317
+#: src/main.c:318
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2562,53 +2562,53 @@ msgstr ""
 "instalação.\n"
 "Opções para forçar marcadas com [*] estão habilitadas por omissão.\n"
 
-#: src/main.c:362
+#: src/main.c:363
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "opção desconhecida de forçar/recusar `%.*s'"
 
-#: src/main.c:367
+#: src/main.c:368
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Aviso: opção forçar/recusar obsoleta `%s'\n"
 
-#: src/main.c:490 src/main.c:500 src/main.c:508
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr "não pode fazer malloc no execbackend"
 
-#: src/main.c:494 src/main.c:517
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr "não pode fazer strdup no execbackend"
 
-#: src/main.c:522
+#: src/main.c:523
 #, c-format
 msgid "failed to exec %s"
 msgstr "falhou executar %s"
 
-#: src/main.c:537
+#: src/main.c:538
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd leva um argumento, não zero"
 
-#: src/main.c:539
+#: src/main.c:540
 msgid "--command-fd only takes one argument"
 msgstr "--command-df leva um argumento"
 
-#: src/main.c:541
+#: src/main.c:542
 msgid "invalid number for --command-fd"
 msgstr "número inválido para --command-fd"
 
-#: src/main.c:543
+#: src/main.c:544
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "não pode abrir `%i' para stream"
 
-#: src/main.c:568
+#: src/main.c:569
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "eof inesperado antes do fim da linha %d"
 
-#: src/main.c:612 src/main.c:627 src/query.c:579 dpkg-deb/main.c:199
-#: dpkg-split/main.c:169
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "é necessária uma opção de acção"
 
@@ -3964,7 +3964,7 @@ msgstr ""
 "Escreva dpkg-deb --help para ajuda sobre manipulação de ficheiros *.deb;\n"
 "Escreva dpkg --help para ajuda sobre instalar de desinstalar pacotes."
 
-#: dpkg-deb/main.c:191
+#: dpkg-deb/main.c:192
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "compressão desconhecida tipo `%s'!"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7aa4574d..c81531b0 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-31 06:03+0300\n"
+"POT-Creation-Date: 2006-06-02 03:58+0300\n"
 "PO-Revision-Date: 2006-02-17 08:52+0200\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -2338,16 +2338,16 @@ msgstr ""
 "ou `more' !"
 
 #: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
-#, c-format
-msgid "conflicting actions --%s and --%s"
+#, fuzzy, c-format
+msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "ações conflitantes --%s e --%s"
 
-#: src/main.c:211
+#: src/main.c:212
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Aviso: opção obsoleta `--%s'\n"
 
-#: src/main.c:219
+#: src/main.c:220
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2385,28 +2385,28 @@ msgstr ""
 "Opções de depuração são misturadas usando o bitwise-or.\n"
 "Note que os significados e valores estão sujeitos à mudanças.\n"
 
-#: src/main.c:240
+#: src/main.c:241
 msgid "--debug requires an octal argument"
 msgstr "--debug requer um argumento octal"
 
-#: src/main.c:264
+#: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "nome de pacote nulo na lista separada por vírgulas `%.250s' em --ignore-"
 "depends"
 
-#: src/main.c:270
+#: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr "--ignore-depends requer um nome de pacote válido. `%.250s' não é; %s"
 
-#: src/main.c:286 src/main.c:297
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "inteiro inválido para --%s: `%.250s'"
 
-#: src/main.c:317
+#: src/main.c:318
 #, fuzzy, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2492,55 +2492,55 @@ msgstr ""
 "instalação.\n"
 "Opções para forçar marcadas com [*] são habilitadas por padrão.\n"
 
-#: src/main.c:362
+#: src/main.c:363
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "opção de forçar/recusar `%.*s' desconhecida"
 
-#: src/main.c:367
+#: src/main.c:368
 #, fuzzy, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Aviso: opção obsoleta `--%s'\n"
 
-#: src/main.c:490 src/main.c:500 src/main.c:508
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr "não foi possível alocar memória em execbackend"
 
-#: src/main.c:494 src/main.c:517
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr "não foi possível fazer strdup em execbackend"
 
-#: src/main.c:522
+#: src/main.c:523
 #, c-format
 msgid "failed to exec %s"
 msgstr "falha ao executar %s"
 
-#: src/main.c:537
+#: src/main.c:538
 #, fuzzy
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd recebe 1 argumento, não 0"
 
-#: src/main.c:539
+#: src/main.c:540
 #, fuzzy
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd recebe somente 1 argumento"
 
-#: src/main.c:541
+#: src/main.c:542
 msgid "invalid number for --command-fd"
 msgstr "número inválido para --command-fd"
 
-#: src/main.c:543
+#: src/main.c:544
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "não foi possível abrir `%i' para stream"
 
-#: src/main.c:568
+#: src/main.c:569
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "eof inesperado após fim da linha %d"
 
-#: src/main.c:612 src/main.c:627 src/query.c:579 dpkg-deb/main.c:199
-#: dpkg-split/main.c:169
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "preciso de uma opção de ação"
 
@@ -3889,7 +3889,7 @@ msgstr ""
 "Digite dpkg-deb --help para ajuda sobre manipulação de arquivos *.deb;\n"
 "Digite dpkg --help para ajuda sobre instalação e desinstalação de pacotes."
 
-#: dpkg-deb/main.c:191
+#: dpkg-deb/main.c:192
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "tipo de compressão desconhecido `%s' !"
diff --git a/po/ro.po b/po/ro.po
index 13195d6f..946a2bee 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ro\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-31 06:03+0300\n"
+"POT-Creation-Date: 2006-06-02 03:58+0300\n"
 "PO-Revision-Date: 2006-05-15 19:29+0300\n"
 "Last-Translator: Eddy Petrişor <eddy.petrisor@gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -2458,16 +2458,16 @@ msgstr ""
 "prin „less” sau „more” !"
 
 #: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
-#, c-format
-msgid "conflicting actions --%s and --%s"
+#, fuzzy, c-format
+msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "acţiuni în conflict --%s şi --%s"
 
-#: src/main.c:211
+#: src/main.c:212
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Avertisment: opţiune învechită „--%s”\n"
 
-#: src/main.c:219
+#: src/main.c:220
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2506,29 +2506,29 @@ msgstr ""
 "Opţiunile de depanare pot fi combinate folosind \"sau\" pe biţi.\n"
 "A se nota că înţelesul şi valorile se pot schimba.\n"
 
-#: src/main.c:240
+#: src/main.c:241
 msgid "--debug requires an octal argument"
 msgstr "--debug necesită un argument octal"
 
-#: src/main.c:264
+#: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "lipsă nume de pachet în lista separată prin virgule „%.250s” de la --ignore-"
 "depends"
 
-#: src/main.c:270
+#: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends necesită un nume valid de pachet. „%.250s” nu este; %s"
 
-#: src/main.c:286 src/main.c:297
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "întreg invalid pentru --%s: „%.250s”"
 
-#: src/main.c:317
+#: src/main.c:318
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2612,53 +2612,53 @@ msgstr ""
 "sistemul dvs.\n"
 "Forţarea opţiunilor marcate cu [*] sunt implicit activate.\n"
 
-#: src/main.c:362
+#: src/main.c:363
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "opţiune de forţare/refuzare necunoscută „%.*s”"
 
-#: src/main.c:367
+#: src/main.c:368
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Avertisment: opţiune învechită de forţare/refuzare „%s”\n"
 
-#: src/main.c:490 src/main.c:500 src/main.c:508
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr "nu s-a putut executa malloc în aplicaţia propriu-zisă"
 
-#: src/main.c:494 src/main.c:517
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr "nu s-a putut executa strdup în aplicaţia propriu-zisă"
 
-#: src/main.c:522
+#: src/main.c:523
 #, c-format
 msgid "failed to exec %s"
 msgstr "eşec la execuţia %s"
 
-#: src/main.c:537
+#: src/main.c:538
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd ia 1 argument, nu zero"
 
-#: src/main.c:539
+#: src/main.c:540
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd ia doar un argument"
 
-#: src/main.c:541
+#: src/main.c:542
 msgid "invalid number for --command-fd"
 msgstr "număr invalid pentru --command-fd"
 
-#: src/main.c:543
+#: src/main.c:544
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "nu s-a putut deschide „%i” pentru fluxul de date"
 
-#: src/main.c:568
+#: src/main.c:569
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "sfârşit neaşteptat de fişier înainte de terminarea liniei %d"
 
-#: src/main.c:612 src/main.c:627 src/query.c:579 dpkg-deb/main.c:199
-#: dpkg-split/main.c:169
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "e necesară o opţiune de acţiune"
 
@@ -4030,7 +4030,7 @@ msgstr ""
 "Tastaţi dpkg --help pentru ajutor despre instalarea şi dezinstalarea "
 "pachetelor."
 
-#: dpkg-deb/main.c:191
+#: dpkg-deb/main.c:192
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "tip de compresie necunoscut „%s”!"
diff --git a/po/ru.po b/po/ru.po
index 7367019f..fb79366e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg_po_ru\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-31 06:03+0300\n"
+"POT-Creation-Date: 2006-06-02 03:58+0300\n"
 "PO-Revision-Date: 2006-05-07 23:11+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -2473,16 +2473,16 @@ msgstr ""
 "Объедините их в конвейер с программами `less' или `more'!"
 
 #: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
-#, c-format
-msgid "conflicting actions --%s and --%s"
+#, fuzzy, c-format
+msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "несовместимые действия --%s и --%s"
 
-#: src/main.c:211
+#: src/main.c:212
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Предупреждение: устаревший параметр `--%s'\n"
 
-#: src/main.c:219
+#: src/main.c:220
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2523,31 +2523,31 @@ msgstr ""
 "Параметры отладки объединяются побитовой операцией \"или\".\n"
 "Имейте в виду, что значения и их смысловая нагрузка могут быть изменены.\n"
 
-#: src/main.c:240
+#: src/main.c:241
 msgid "--debug requires an octal argument"
 msgstr "параметр --debug принимает в качестве аргумента восьмеричное число"
 
-#: src/main.c:264
+#: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "пустое имя пакета в разделённом запятыми списке игнорируемых зависимостей `"
 "%.250s'"
 
-#: src/main.c:270
+#: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends требует корректного имени пакета. `%.250s' таковым не "
 "является: %s"
 
-#: src/main.c:286 src/main.c:297
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr ""
 "аргумент --%s (`%.250s') не является допустимым целочисленным значением"
 
-#: src/main.c:317
+#: src/main.c:318
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2633,53 +2633,53 @@ msgstr ""
 "повредить\n"
 "вашу систему. Параметры, отмеченные [*], задействованы по умолчанию.\n"
 
-#: src/main.c:362
+#: src/main.c:363
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "недопустимый параметр игнорирования/обработки проблем `%.*s'"
 
-#: src/main.c:367
+#: src/main.c:368
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Предупреждение: устаревший параметр игнорирования/обработки `%s'\n"
 
-#: src/main.c:490 src/main.c:500 src/main.c:508
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr "не удалось выделить память при работе функции execbackend"
 
-#: src/main.c:494 src/main.c:517
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr "не удалось скопировать строку при работе функции execbackend"
 
-#: src/main.c:522
+#: src/main.c:523
 #, c-format
 msgid "failed to exec %s"
 msgstr "не удалось запустить %s"
 
-#: src/main.c:537
+#: src/main.c:538
 msgid "--command-fd takes one argument, not zero"
 msgstr "параметр --command-fd принимает один аргумент, а не ноль"
 
-#: src/main.c:539
+#: src/main.c:540
 msgid "--command-fd only takes one argument"
 msgstr "параметр --command-fd принимает только один аргумент"
 
-#: src/main.c:541
+#: src/main.c:542
 msgid "invalid number for --command-fd"
 msgstr "аргумент параметра --command-fd не является числом"
 
-#: src/main.c:543
+#: src/main.c:544
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "не удалось открыть поток дескриптора `%i'"
 
-#: src/main.c:568
+#: src/main.c:569
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "неожиданный конец файла, ещё не кончилась строка %d"
 
-#: src/main.c:612 src/main.c:627 src/query.c:579 dpkg-deb/main.c:199
-#: dpkg-split/main.c:169
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "требуется параметр действия"
 
@@ -4057,7 +4057,7 @@ msgstr ""
 "Чтобы получить информацию об установке и удалении пакетов, введите dpkg --"
 "help."
 
-#: dpkg-deb/main.c:191
+#: dpkg-deb/main.c:192
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "неизвестный тип сжатия --`%s'!"
diff --git a/po/sk.po b/po/sk.po
index 8726ce4b..27570f39 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-31 06:03+0300\n"
+"POT-Creation-Date: 2006-06-02 03:58+0300\n"
 "PO-Revision-Date: 2006-05-30 11:58+0200\n"
 "Last-Translator: Peter Mann <Peter.Mann@tuke.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -2320,16 +2320,16 @@ msgstr ""
 "Voľby označené [*] produkujú rozsiahly výstup - použite `less' alebo `more' !"
 
 #: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
-#, c-format
-msgid "conflicting actions --%s and --%s"
+#, fuzzy, c-format
+msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "odporujúce si akcie --%s a --%s"
 
-#: src/main.c:211
+#: src/main.c:212
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Upozornenie: zastaralá voľba `--%s'\n"
 
-#: src/main.c:219
+#: src/main.c:220
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2366,27 +2366,27 @@ msgstr ""
 "Ladiace voľby môžu byť mixované použitím bitwise-or.\n"
 "Poznámka: významy a hodnoty sa môžu často meniť.\n"
 
-#: src/main.c:240
+#: src/main.c:241
 msgid "--debug requires an octal argument"
 msgstr "--debug vyžaduje osmičkový argument"
 
-#: src/main.c:264
+#: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "prázdny názov balíku v dvojbodkou oddelenom zozname --ignore-depends `%.250s'"
 
-#: src/main.c:270
+#: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr "--ignore-depends vyžaduje platný názov balíku. `%.250s' nie je; %s"
 
-#: src/main.c:286 src/main.c:297
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "neplatné číslo pre --%s: `%.250s'"
 
-#: src/main.c:317
+#: src/main.c:318
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2470,53 +2470,53 @@ msgstr ""
 "inštaláciu.\n"
 "Vynútenie volieb označených [*] je štandartne povolené.\n"
 
-#: src/main.c:362
+#: src/main.c:363
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "neznáma vynucovacia/odmietacia voľba `%.*s'"
 
-#: src/main.c:367
+#: src/main.c:368
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Upozornenie: zastaralá vynucovacia/zakazovacia voľba `%s'\n"
 
-#: src/main.c:490 src/main.c:500 src/main.c:508
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr "nemôže vykonať funkciu malloc v execbackend"
 
-#: src/main.c:494 src/main.c:517
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr "nemôže vykonať funkciu strdup v execbackend"
 
-#: src/main.c:522
+#: src/main.c:523
 #, c-format
 msgid "failed to exec %s"
 msgstr "nie je možné spustiť %s"
 
-#: src/main.c:537
+#: src/main.c:538
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd vyžaduje jeden parameter, nie nula"
 
-#: src/main.c:539
+#: src/main.c:540
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd vyžaduje len jeden parameter"
 
-#: src/main.c:541
+#: src/main.c:542
 msgid "invalid number for --command-fd"
 msgstr "neplatné číslo pre --command-fd"
 
-#: src/main.c:543
+#: src/main.c:544
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "nie je možné otvoriť `%i' pre tok"
 
-#: src/main.c:568
+#: src/main.c:569
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "nečakaný koniec súboru pred koncom riadku %d"
 
-#: src/main.c:612 src/main.c:627 src/query.c:579 dpkg-deb/main.c:199
-#: dpkg-split/main.c:169
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "potrebujem zadať akciu"
 
@@ -3819,7 +3819,7 @@ msgstr ""
 "Napíšte dpkg-deb --help pre nápovedu o manipulácii s *.deb súbormi;\n"
 "Napíšte dpkg --help pre nápovedu o inštalácii a deinštalácii balíkov."
 
-#: dpkg-deb/main.c:191
+#: dpkg-deb/main.c:192
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "neznámy typ kompresie `%s'!"
diff --git a/po/sv.po b/po/sv.po
index 4e40f7ac..cb2c9adf 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13.11.0.1\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-31 06:03+0300\n"
+"POT-Creation-Date: 2006-06-02 03:58+0300\n"
 "PO-Revision-Date: 2006-05-14 15:45+0100\n"
 "Last-Translator: Peter Karlsson <peterk@debian.org>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
@@ -2372,16 +2372,16 @@ msgstr ""
 "\"!"
 
 #: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
-#, c-format
-msgid "conflicting actions --%s and --%s"
+#, fuzzy, c-format
+msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "motstridiga åtgärder --%s och --%s"
 
-#: src/main.c:211
+#: src/main.c:212
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Varning: föråldrad flagga \"--%s\"\n"
 
-#: src/main.c:219
+#: src/main.c:220
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2418,27 +2418,27 @@ msgstr ""
 "Felsökningsflaggor kombineras med bitvis eller.\n"
 "Notera att betydelser och värden kan komma att ändras.\n"
 
-#: src/main.c:240
+#: src/main.c:241
 msgid "--debug requires an octal argument"
 msgstr "--debug behöver ett oktalt argument"
 
-#: src/main.c:264
+#: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr "tomt paketnamn i --ignore-depends kommaseparerade lista \"%.250s\""
 
-#: src/main.c:270
+#: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends behöver ett giltigt paketnamn. \"%.250s\" är inte det; %s"
 
-#: src/main.c:286 src/main.c:297
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "ogiltigt heltal för --%s: \"%.250s\""
 
-#: src/main.c:317
+#: src/main.c:318
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2512,53 +2512,53 @@ msgstr ""
 "installation\n"
 "om de används. Flaggor markerade [*] är förvalda.\n"
 
-#: src/main.c:362
+#: src/main.c:363
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "okänd flagga för force/refuse: \"%.*s\""
 
-#: src/main.c:367
+#: src/main.c:368
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Varning: föråldrad tvingande/vägrande flagga \"%s\"\n"
 
-#: src/main.c:490 src/main.c:500 src/main.c:508
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr "kunde inte allokera i execbackend"
 
-#: src/main.c:494 src/main.c:517
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr "kunde inte duplicera sträng i execbackend"
 
-#: src/main.c:522
+#: src/main.c:523
 #, c-format
 msgid "failed to exec %s"
 msgstr "kunde inte exekvera %s"
 
-#: src/main.c:537
+#: src/main.c:538
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd tar ett argument, inte noll"
 
-#: src/main.c:539
+#: src/main.c:540
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd tar bara ett argument"
 
-#: src/main.c:541
+#: src/main.c:542
 msgid "invalid number for --command-fd"
 msgstr "ogiltigt tal för --command-fd"
 
-#: src/main.c:543
+#: src/main.c:544
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "kunde inte öppna \"%i\" för ström"
 
-#: src/main.c:568
+#: src/main.c:569
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "oväntat filslut före slut på rad %d"
 
-#: src/main.c:612 src/main.c:627 src/query.c:579 dpkg-deb/main.c:199
-#: dpkg-split/main.c:169
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "behöver en åtgärd att utföra"
 
@@ -3893,7 +3893,7 @@ msgstr ""
 "Skriv dpkg-deb --help för hjälp om att hantera *.deb-filer\n"
 "Skriv dpkg --help för hjälp om att installera och avinstallera paket."
 
-#: dpkg-deb/main.c:191
+#: dpkg-deb/main.c:192
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "okänd komprimeringstyp \"%s\"."
diff --git a/po/tl.po b/po/tl.po
index 1db9defa..e0e1d73f 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-31 06:03+0300\n"
+"POT-Creation-Date: 2006-06-02 03:58+0300\n"
 "PO-Revision-Date: 2006-02-17 08:53+0200\n"
 "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -2346,16 +2346,16 @@ msgstr ""
 "sa `less' o `more' !"
 
 #: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
-#, c-format
-msgid "conflicting actions --%s and --%s"
+#, fuzzy, c-format
+msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "magkatunggaling gagawin --%s at --%s"
 
-#: src/main.c:211
+#: src/main.c:212
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Babala: laos na opsyon `--%s'\n"
 
-#: src/main.c:219
+#: src/main.c:220
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2392,30 +2392,30 @@ msgstr ""
 "Opsyon sa pag-debug ay pinagsasama gamit ang bitwise-or.\n"
 "Unawain na ang mga kahulugan at halaga ay maaaring magbago.\n"
 
-#: src/main.c:240
+#: src/main.c:241
 msgid "--debug requires an octal argument"
 msgstr "--debug ay nangangailangan ng argumentong octal"
 
-#: src/main.c:264
+#: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "pangalan ng pakete na null sa --ignore-depends listahang hiwalay-ng-koma `"
 "%.250s'"
 
-#: src/main.c:270
+#: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 "--ignore-depends ay nangangailangan ng legal na pangalan ng pakete. `%.250s' "
 "ay hindi: %s"
 
-#: src/main.c:286 src/main.c:297
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "di tanggap na integer para sa --%s: `%.250s'"
 
-#: src/main.c:317
+#: src/main.c:318
 #, fuzzy, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2506,55 +2506,55 @@ msgstr ""
 "ay\n"
 "naka-enable na default.\n"
 
-#: src/main.c:362
+#: src/main.c:363
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "di kilalang opsyon na force/refuse `%.*s'"
 
-#: src/main.c:367
+#: src/main.c:368
 #, fuzzy, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Babala: laos na opsyon `--%s'\n"
 
-#: src/main.c:490 src/main.c:500 src/main.c:508
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr "hindi maka-malloc sa execbackend"
 
-#: src/main.c:494 src/main.c:517
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr "hindi maka-strdup sa execbackend"
 
-#: src/main.c:522
+#: src/main.c:523
 #, c-format
 msgid "failed to exec %s"
 msgstr "bigo sa pag-exec ng %s"
 
-#: src/main.c:537
+#: src/main.c:538
 #, fuzzy
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd ay tumatanggap ng 1 argumento, hindi 0"
 
-#: src/main.c:539
+#: src/main.c:540
 #, fuzzy
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd ay tumatanggap lamang ng 1 argumento"
 
-#: src/main.c:541
+#: src/main.c:542
 msgid "invalid number for --command-fd"
 msgstr "di tanggap na numero para sa --command-fd"
 
-#: src/main.c:543
+#: src/main.c:544
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "hindi mabuksan ang `%i' para sa stream"
 
-#: src/main.c:568
+#: src/main.c:569
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "di inaasahang eof bago matapos ang linya %d"
 
-#: src/main.c:612 src/main.c:627 src/query.c:579 dpkg-deb/main.c:199
-#: dpkg-split/main.c:169
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "kailangan ng opsyon ng gagawin"
 
@@ -3904,7 +3904,7 @@ msgstr ""
 "dpkg-deb --help para sa tulong tungkol sa pag-manipulate ng *.deb;\n"
 "dpkg --help para sa tulong tungkol sa pagluklok at pagtanggal ng mga pakete."
 
-#: dpkg-deb/main.c:191
+#: dpkg-deb/main.c:192
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "di kilalang uri ng compression `%s'!"
diff --git a/po/vi.po b/po/vi.po
index 8eab2d82..2ebc5dff 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-31 06:03+0300\n"
+"POT-Creation-Date: 2006-06-02 03:58+0300\n"
 "PO-Revision-Date: 2006-05-24 23:14+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -2471,16 +2471,16 @@ msgstr ""
 "hãy gởi hết qua ống dẫn tới chương trình « less » hoặc « more »."
 
 #: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
-#, c-format
-msgid "conflicting actions --%s and --%s"
+#, fuzzy, c-format
+msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "hành động xung đột « --%s » và « --%s »"
 
-#: src/main.c:211
+#: src/main.c:212
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Cảnh báo: tùy chọn cũ kỹ « --%s »\n"
 
-#: src/main.c:219
+#: src/main.c:220
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2520,28 +2520,28 @@ msgstr ""
 "Tùy chọn gỡ lỗi có thể gộp lại dùng phép toán « bitwise-or ».\n"
 "Chú ý rằng sẽ thay đổi ý nghĩa và giá trị.\n"
 
-#: src/main.c:240
+#: src/main.c:241
 msgid "--debug requires an octal argument"
 msgstr "« --debug » (gỡ lỗi) cần một đối số bát phân"
 
-#: src/main.c:264
+#: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "tên gói rỗng trong danh sách định giới bằng dấu phẩy « --ignore-depends "
 "» (bỏ qua cách phụ thuộc) « %.250s »"
 
-#: src/main.c:270
+#: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr "« --ignore-depends » cần một tên gói đúng. « %.250s » không phải; %s"
 
-#: src/main.c:286 src/main.c:297
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "số nguyên không hợp lệ cho « --%s »: « %.250s »"
 
-#: src/main.c:317
+#: src/main.c:318
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2627,56 +2627,56 @@ msgstr ""
 "CẢNH BÁO — sử dụng tùy chọn có dấu cảm [!] có thể làm hỏng nặng hệ thống.\n"
 "Tùy chọn bắt buộc có dấu sao [*] được bật theo mặc định.\n"
 
-#: src/main.c:362
+#: src/main.c:363
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "tùy chọn bắt buộc/từ chối không rõ « %.*s »"
 
-#: src/main.c:367
+#: src/main.c:368
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Cảnh báo: tùy chọn ép buộc/từ chối cũ kỹ « %s »\n"
 
-#: src/main.c:490 src/main.c:500 src/main.c:508
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr ""
 "không thể malloc (cấp phát bộ nhớ) trong execbackend (thực hiện hbậu phương)"
 
-#: src/main.c:494 src/main.c:517
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr ""
 "không thể strdup (sao lại chuỗi) trong execbackend (thực hiện hbậu phương)"
 
-#: src/main.c:522
+#: src/main.c:523
 #, c-format
 msgid "failed to exec %s"
 msgstr "việc thực hiện %s bị lỗi"
 
-#: src/main.c:537
+#: src/main.c:538
 msgid "--command-fd takes one argument, not zero"
 msgstr ""
 "« --command-fd » (lệnh mô tả tập tin) chấp nhận chỉ một đối số (không phải 0)"
 
-#: src/main.c:539
+#: src/main.c:540
 msgid "--command-fd only takes one argument"
 msgstr "« --command-fd » (lệnh mô tả tập tin) chấp nhận chỉ một đối số thôi"
 
-#: src/main.c:541
+#: src/main.c:542
 msgid "invalid number for --command-fd"
 msgstr "số không hợp lệ cho « --command-fd »"
 
-#: src/main.c:543
+#: src/main.c:544
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "không thể mở « %i » cho luồng"
 
-#: src/main.c:568
+#: src/main.c:569
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "gặp kết thúc tập tin bất ngờ trước kết thúc dòng %d"
 
-#: src/main.c:612 src/main.c:627 src/query.c:579 dpkg-deb/main.c:199
-#: dpkg-split/main.c:169
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "cần một tùy chọn hành động"
 
@@ -4025,7 +4025,7 @@ msgstr ""
 "dpkg-deb --help \t\tđể xem trợ giúp về thao tác các tập tin *.deb;\n"
 "dpkg --help \t\t\t\tđể xem trợ giúp về cài đặt và gỡ bỏ các gói."
 
-#: dpkg-deb/main.c:191
+#: dpkg-deb/main.c:192
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "dạng nén không rõ « %s »."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 870db775..97ad67c8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-31 06:03+0300\n"
+"POT-Creation-Date: 2006-06-02 03:58+0300\n"
 "PO-Revision-Date: 2006-05-12 20:57+0800\n"
 "Last-Translator: Kov Chai <tchaikov@sjtu.edu.cn>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
@@ -2332,16 +2332,16 @@ msgstr ""
 "到“less”或“more”！"
 
 #: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
-#, c-format
-msgid "conflicting actions --%s and --%s"
+#, fuzzy, c-format
+msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "操作之间有矛盾 -- %s 和 -- %s"
 
-#: src/main.c:211
+#: src/main.c:212
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "警告：已废弃不用的选项“--%s”\n"
 
-#: src/main.c:219
+#: src/main.c:220
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2378,27 +2378,27 @@ msgstr ""
 "可以用位与(bitwise-or)把除错选项组合起来使用。\n"
 "注意，意义和数值将有可能更动。\n"
 
-#: src/main.c:240
+#: src/main.c:241
 msgid "--debug requires an octal argument"
 msgstr "--debug 需要一个八进制的参数"
 
-#: src/main.c:264
+#: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "在 --ignore-depends 的用逗号相隔的参数列表“%s”中，发现有的软件包名是空的"
 
-#: src/main.c:270
+#: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr "--ignore-depends 需要一个有效的软件包名。而“%.250s”却不是；%s"
 
-#: src/main.c:286 src/main.c:297
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "--%s 有一个无效的数字参数：“%.250s”"
 
-#: src/main.c:317
+#: src/main.c:318
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2470,53 +2470,53 @@ msgstr ""
 "警告 - 使用带有[!]标记的选项可能会严重破坏您的系统。\n"
 "缺省情况下，是使用带有[*]标记的强制手段的。\n"
 
-#: src/main.c:362
+#: src/main.c:363
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "无法识别的 force/refuse 选项“%.*s”"
 
-#: src/main.c:367
+#: src/main.c:368
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "警告：已废弃不用强制或拒绝选项“--%s”\n"
 
-#: src/main.c:490 src/main.c:500 src/main.c:508
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr "无法在 execbackend 中 malloc"
 
-#: src/main.c:494 src/main.c:517
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr "无法在 execbackend 中 strdup"
 
-#: src/main.c:522
+#: src/main.c:523
 #, c-format
 msgid "failed to exec %s"
 msgstr "exec %s 失败"
 
-#: src/main.c:537
+#: src/main.c:538
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd 需要带一个参数，而非零个"
 
-#: src/main.c:539
+#: src/main.c:540
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd 只需带一个参数"
 
-#: src/main.c:541
+#: src/main.c:542
 msgid "invalid number for --command-fd"
 msgstr "--command-fd 有一个无效的数字参数"
 
-#: src/main.c:543
+#: src/main.c:544
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "无法打开“%i”，并把它作为字符流操作"
 
-#: src/main.c:568
+#: src/main.c:569
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "在第 %d 行还未结束时，发现了预料之外的 eof"
 
-#: src/main.c:612 src/main.c:627 src/query.c:579 dpkg-deb/main.c:199
-#: dpkg-split/main.c:169
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "需要一个指示操作的选项"
 
@@ -3817,7 +3817,7 @@ msgstr ""
 "输入 dpkg-deb --help 可获得有关操作 *.deb 文件的帮助；\n"
 "输入 dpkg --help 可获得有关安装和卸载软件包的帮助。"
 
-#: dpkg-deb/main.c:191
+#: dpkg-deb/main.c:192
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "无法识别的压缩类型“%s”！"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a1ed6096..1ee664ed 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-31 06:03+0300\n"
+"POT-Creation-Date: 2006-06-02 03:58+0300\n"
 "PO-Revision-Date: 2006-02-17 08:53+0200\n"
 "Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -2266,16 +2266,16 @@ msgstr ""
 "帶有[*]的選項將會輸出較大篇幅的文字 - 可使用管線將其輸出到“less”或“more”！"
 
 #: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
-#, c-format
-msgid "conflicting actions --%s and --%s"
+#, fuzzy, c-format
+msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "操作之間有矛盾 -- %s 和 -- %s"
 
-#: src/main.c:211
+#: src/main.c:212
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "警告：已廢棄不用的選項“--%s”\n"
 
-#: src/main.c:219
+#: src/main.c:220
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2312,26 +2312,26 @@ msgstr ""
 "可以用位元運算(bitwise-or)把除錯選項組合起來使用。\n"
 "注意，意義和數值將有可能更動。\n"
 
-#: src/main.c:240
+#: src/main.c:241
 msgid "--debug requires an octal argument"
 msgstr "--debug 需要一個八進制的參數"
 
-#: src/main.c:264
+#: src/main.c:265
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr "在 --ignore-depends 的用逗號相隔的參數列表“%s”中，發現有的套件名是空的"
 
-#: src/main.c:270
+#: src/main.c:271
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr "--ignore-depends 需要一個有效的套件名。而“%.250s”卻不是﹔%s"
 
-#: src/main.c:286 src/main.c:297
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "--%s 有一個無效的數字參數：“%.250s”"
 
-#: src/main.c:317
+#: src/main.c:318
 #, fuzzy, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2403,55 +2403,55 @@ msgstr ""
 "警告 - 使用帶有[!]標記的選項可能會嚴重破壞您的系統安裝。\n"
 "預設情況下，是使用帶有[*]標記的強制方法。\n"
 
-#: src/main.c:362
+#: src/main.c:363
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "無法識別的 force/refuse 選項“%.*s”"
 
-#: src/main.c:367
+#: src/main.c:368
 #, fuzzy, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "警告：已廢棄不用的選項“--%s”\n"
 
-#: src/main.c:490 src/main.c:500 src/main.c:508
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr "無法在 execbackend 中 malloc"
 
-#: src/main.c:494 src/main.c:517
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr "無法在 execbackend 中 strdup"
 
-#: src/main.c:522
+#: src/main.c:523
 #, c-format
 msgid "failed to exec %s"
 msgstr "exec %s 失敗"
 
-#: src/main.c:537
+#: src/main.c:538
 #, fuzzy
 msgid "--command-fd takes one argument, not zero"
 msgstr "--command-fd 需要帶一個參數，而不是零個"
 
-#: src/main.c:539
+#: src/main.c:540
 #, fuzzy
 msgid "--command-fd only takes one argument"
 msgstr "--command-fd 只需帶一個參數"
 
-#: src/main.c:541
+#: src/main.c:542
 msgid "invalid number for --command-fd"
 msgstr "--command-fd 有一個無效的數字參數"
 
-#: src/main.c:543
+#: src/main.c:544
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "無法打開“%i”，並把它作為串流處理"
 
-#: src/main.c:568
+#: src/main.c:569
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "在第 %d 行還未結束時，發現了預料之外的 eof"
 
-#: src/main.c:612 src/main.c:627 src/query.c:579 dpkg-deb/main.c:199
-#: dpkg-split/main.c:169
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:200
+#: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "需要一個指示操作的選項"
 
@@ -3731,7 +3731,7 @@ msgstr ""
 "輸入 dpkg-deb --help 可獲得有關操作 *.deb 檔案的幫助﹔\n"
 "輸入 dpkg --help 可獲得有關安裝和移除套件的幫助。"
 
-#: dpkg-deb/main.c:191
+#: dpkg-deb/main.c:192
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "無法識別的壓縮類型“%s”！"
diff --git a/src/main.c b/src/main.c
index 51ad79c1..29e4cc7d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -203,7 +203,8 @@ static void versiononly(const struct cmdinfo *cip, const char *value) {
 
 static void setaction(const struct cmdinfo *cip, const char *value) {
   if (cipaction)
-    badusage(_("conflicting actions --%s and --%s"),cip->olong,cipaction->olong);
+    badusage(_("conflicting actions -%c (--%s) and -%c (--%s)"),
+             cip->oshort, cip->olong, cipaction->oshort, cipaction->olong);
   cipaction= cip;
 }
 
diff --git a/src/query.c b/src/query.c
index f49a0990..cc1324f0 100644
--- a/src/query.c
+++ b/src/query.c
@@ -541,7 +541,8 @@ static void versiononly(const struct cmdinfo *cip, const char *value) {
 
 static void setaction(const struct cmdinfo *cip, const char *value) {
   if (cipaction)
-    badusage(_("conflicting actions --%s and --%s"),cip->olong,cipaction->olong);
+    badusage(_("conflicting actions -%c (--%s) and -%c (--%s)"),
+             cip->oshort, cip->olong, cipaction->oshort, cipaction->olong);
   cipaction= cip;
 }