From: Guillem Jover <guillem@debian.org>
Date: Tue, 15 May 2007 13:02:14 +0000 (+0000)
Subject: Regenerated .pot files. Merged .po files with .pot files.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0623cd3fe83c9c50ff416c9c55ef13004ceecba6;p=dpkg

Regenerated .pot files. Merged .po files with .pot files.
---

diff --git a/po/ChangeLog b/po/ChangeLog
index bec930b5..498d7d97 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-15  Guillem Jover  <guillem@debian.org>
+
+	* dpkg.pot: Regenerated.
+	* *.po: Merged with dpkg.pot. Formerly completed translations
+	become 919t1f1u.
+
 2007-05-11  Christian Perrier  <bubulle@debian.org>
 
 	* fr.po: Updated to 921t.
diff --git a/po/bs.po b/po/bs.po
index 14f9a6fb..5a5a890c 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: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+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"
@@ -3975,7 +3975,7 @@ msgid "unable to close %s after read: %s"
 msgstr ""
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr ""
@@ -4037,9 +4037,10 @@ msgid ""
 "divert.\n"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
 #, perl-format
-msgid "two modes specified: %s and --%s"
+msgid "two commands specified: %s and --%s"
 msgstr ""
 
 #: scripts/dpkg-divert.pl:111
@@ -4061,13 +4062,13 @@ msgid "package may not contain newlines"
 msgstr ""
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr ""
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, perl-format
 msgid "unknown option `%s'"
 msgstr ""
@@ -4212,7 +4213,7 @@ msgstr ""
 msgid "install new diversions: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr ""
@@ -4583,7 +4584,7 @@ msgid ""
 msgstr ""
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
+msgid "invalid update mode"
 msgstr ""
 
 #: scripts/update-alternatives.pl:135
@@ -4618,261 +4619,261 @@ msgid ""
 "alternatives."
 msgstr ""
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr ""
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 msgid "No versions available."
 msgstr ""
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr ""
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr ""
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, perl-format
 msgid "--%s needs <name>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
 msgstr ""
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr ""
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
 "Switching to manual updates only."
 msgstr ""
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
 "(You may modify the symlinks there yourself if desired - see `man ln'.)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr ""
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr ""
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr ""
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr ""
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
 " (or nonexistent); however, readlink failed: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
 " %s, or nonexistent; however, readlink failed: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, perl-format
 msgid ""
 "There is no program which provides %s.\n"
 "Nothing to configure.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
 "(%s). Nothing to configure.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -4881,41 +4882,41 @@ msgid ""
 "-----------------------------------------------\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, perl-format
 msgid "missing newline after %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 8bc1f0aa..dd11e0f7 100644
--- a/po/ca.po
+++ b/po/ca.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: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+0300\n"
 "PO-Revision-Date: 2006-11-02 02:25+0200\n"
 "Last-Translator: Jordà Polo <jorda@ettin.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -4541,7 +4541,7 @@ msgid "unable to close %s after read: %s"
 msgstr "no es pot tancar %s després de la lectura: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "no es pot tancar %s: %s"
@@ -4633,9 +4633,10 @@ msgstr ""
 "Els guions de preinst/postrm sempre haurien d'especificar --package i --"
 "divert.\n"
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
-#, perl-format
-msgid "two modes specified: %s and --%s"
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
+#, fuzzy, perl-format
+msgid "two commands specified: %s and --%s"
 msgstr "s'ha especificat dos modes: %s i --%s"
 
 #: scripts/dpkg-divert.pl:111
@@ -4657,13 +4658,13 @@ msgid "package may not contain newlines"
 msgstr "el paquet no pot contenir salts de línia"
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s necessita un <directori> com a paràmetre"
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "l'opció «%s» és desconeguda"
@@ -4818,7 +4819,7 @@ msgstr "crea el nou diversions-old: %s"
 msgid "install new diversions: %s"
 msgstr "instal·la el nou diversions: %s"
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "s'ha produït un error intern: %s està corromput: %s"
@@ -5290,8 +5291,8 @@ msgstr ""
 "  --version                mostra la versió.\n"
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
-msgstr "manflag"
+msgid "invalid update mode"
+msgstr ""
 
 #: scripts/update-alternatives.pl:135
 #, perl-format
@@ -5327,92 +5328,92 @@ msgstr ""
 "L'alternativa per %s apunta a %s, però no ha estat possible trobar-la. "
 "S'està esborrant de la llista d'alternatives."
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - l'estat és %s."
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr " l'enllaç apunta actualment cap a %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr " l'enllaç està actualment absent"
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " no es pot llegir l'enllaç - %s"
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - prioritat %s"
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr " esclau %s: %s"
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 msgid "No versions available."
 msgstr "No hi ha cap versió disponible."
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "Actualment la «millor» versió és %s."
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "l'argument «%s» és desconegut"
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install necessita <enllaç> <nom> <camí> <prioritat>"
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr "la prioritat ha de ser un enter"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s necessita <nom> <camí>"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s necessita <nom>"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave necessita <enllaç> <nom> <camí>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "el nom de l'esclau %s està duplicat"
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "l'enllaç duplicat %s està duplicat"
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "el nom %s és alhora primari i esclau"
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "l'enllaç %s és alhora primari i esclau"
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5420,31 +5421,31 @@ msgstr ""
 "es necessita --display, --config, --set, --install, --remove, --all, --"
 "remove-all o --auto"
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr "--slave només es pot especificar junt amb --install"
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "No hi ha alternatives per a %s."
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "S'està configurant la selecció automàtica de %s."
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "no es pot esborrar %s: %s"
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5453,7 +5454,7 @@ msgstr ""
 "%s ha estat modificat (manualment o per alguna seqüència).\n"
 "S'està canviant a modificacions manuals únicament."
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5463,7 +5464,7 @@ msgstr ""
 "a %s ...\n"
 "(Si ho voleu, podeu modificar els enllaços simbòlics - vegeu «man ln».)"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "S'està tornant a anomenar l'enllaç %s de %s a %s.n"
@@ -5471,67 +5472,67 @@ msgstr "S'està tornant a anomenar l'enllaç %s de %s a %s.n"
 # Reanomenar - Canviar el nom - Tornar a anomenar? -- Jordà
 # Jo personalment preferisc "canvia el nom", però per exemple al Termcat
 # van més amb reanomena, i el GNOME ho està seguint.
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "no es pot reanomenar %s a %s: %s"
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "nom d'enllaç esclau %s duplicat"
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "S'està tornant a anomenar l'enllaç esclau %s de %s a %s."
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 "S'està suprimint l'alternativa seleccionada manualment - s'està canviant a "
 "mode automàtic"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "L'alternativa %s per a %s no està registrada, no s'esborrarà."
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "S'està descartant l'enllaç esclau obsolet %s (%s)."
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr ""
 "Les actualitacions automàtiques de %s estan desactivades, no hi haurà canvis."
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 "Per tornar a activar les actualitzacions automàtiques, utilitzeu «update-"
 "alternatives --auto %s»."
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "S'està restablint d'una actualització prèvia fallida de %s ..."
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "no es pot obrir %s per a l'escriptura: %s"
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "S'ha desinstal·lat el darrer paquet que proveeix %s (%s), s'esborrarà."
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5540,38 +5541,38 @@ msgstr ""
 "avís: %s hauria de ser un enllaç simbòlic a %s\n"
 " (o no existent); tanmateix, readlink ha fallat: %s"
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "no es pot garantir que %s sigui no existent: %s"
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "no es pot fer l'enllaç simbòlic de %s a %s: %s"
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "no es pot instal·lar %s com a %s: %s"
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "S'està deixant %s (%s) apuntant cap a %s."
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "S'està actualitzant %s (%s) per apuntar cap a %s."
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5580,13 +5581,13 @@ msgstr ""
 "avís: %s hauria de ser un enllaç simbòlic esclau a\n"
 " %s, o no existent; tanmateix, readlink ha fallat: %s"
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "S'està esborrant %s (%s), no és apropiat amb %s."
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5595,7 +5596,7 @@ msgstr ""
 "Només hi ha 1 programa que proveeixi %s\n"
 "(%s). No hi ha res a configurar.\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5604,7 +5605,7 @@ msgstr ""
 "Només hi ha 1 programa que proveeixi %s\n"
 "(%s). No hi ha res a configurar.\n"
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5617,48 +5618,54 @@ msgstr ""
 "  Selecció     Alternativa\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 "Premeu retorn per a mantenir l'opció per defecte[*], o introduïu un número "
 "de selecció: "
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "S'utilitzarà «%s» per proveir «%s»."
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "No es pot trobar l'alternativa «%s»."
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "s'ha produït un error en escriure la sortida estàndard: %s"
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 "els salts de línia no estan permesos als fitxers d'update-alternatives (%s)"
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "s'ha produït un error o final de fitxer en llegir %s per %s (%s)"
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, perl-format
 msgid "missing newline after %s"
 msgstr "falta un salt de línia després de %s"
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Problema seriós: %s"
 
+#~ msgid "two modes specified: %s and --%s"
+#~ msgstr "s'ha especificat dos modes: %s i --%s"
+
+#~ msgid "manflag"
+#~ msgstr "manflag"
+
 #~ msgid "%s: failed to exec gzip -dc"
 #~ msgstr "%s: no s'ha pogut executar gzip -dc"
 
diff --git a/po/cs.po b/po/cs.po
index dea7c24d..968cbe98 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: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+0300\n"
 "PO-Revision-Date: 2006-08-18 17:12+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -4367,7 +4367,7 @@ msgid "unable to close %s after read: %s"
 msgstr "po čtení nelze zavřít %s: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "nelze zavřít %s: %s"
@@ -4456,9 +4456,10 @@ msgstr ""
 "Před/poinstalační skripty balíku by měly vždy používat --package a --"
 "divert.\n"
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
-#, perl-format
-msgid "two modes specified: %s and --%s"
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
+#, fuzzy, perl-format
+msgid "two commands specified: %s and --%s"
 msgstr "zadány dva režimy: %s a --%s"
 
 #: scripts/dpkg-divert.pl:111
@@ -4480,13 +4481,13 @@ msgid "package may not contain newlines"
 msgstr "jméno balíku nemůže obsahovat znak nového řádku"
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s vyžaduje jako argument <adresář>"
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "neznámá volba \"%s\""
@@ -4639,7 +4640,7 @@ msgstr "vytvoření nového souboru diversions-old: %s"
 msgid "install new diversions: %s"
 msgstr "instalace nového souboru diversions: %s"
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "vnitřní chyba: %s porušeno: %s"
@@ -5091,8 +5092,8 @@ msgstr ""
 "  --version                zobrazí verzi\n"
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
-msgstr "ruční příznak"
+msgid "invalid update mode"
+msgstr ""
 
 #: scripts/update-alternatives.pl:135
 #, perl-format
@@ -5128,92 +5129,92 @@ msgstr ""
 "Alternativa pro %s ukazuje na verzi %s, která nebyla nalezena. Odstraňuji ze "
 "systému alternativ."
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - stav je %s."
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr " odkaz momentálně ukazuje na %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr " odkaz momentálně chybí"
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " odkaz není čitelný - %s"
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - priorita %s"
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr " závislost %s: %s"
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 msgid "No versions available."
 msgstr "Nejsou k dispozici žádné verze."
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "Momentálně \"nejlepší\" verze je \"%s\"."
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "neznámý argument `%s'"
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install vyžaduje <odkaz> <jméno> <cesta> <priorita>"
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr "priorita musí být celé číslo"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s vyžaduje <jméno> <cesta>"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s vyžaduje <jméno>"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave vyžaduje <odkaz> <jméno> <cesta>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "závislé jméno %s je duplicitní"
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "závislý odkaz %s je duplicitní"
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "jméno %s je jak primární, tak závislé"
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "odkaz %s je jak primární, tak závislý"
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5221,31 +5222,31 @@ msgstr ""
 "vyžaduji --display, --config, --set, --install, --remove, --all, --remove-"
 "all nebo --auto"
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr "--slave je povoleno jen současně s --install"
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Pro %s neexistují žádné alternativy."
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Nastavuji automatický výběr %s."
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "nelze odstranit %s: %s"
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5254,7 +5255,7 @@ msgstr ""
 "%s byl změněn (vámi nebo skriptem).\n"
 "Přepínám pouze na ruční aktualizace."
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5263,70 +5264,70 @@ msgstr ""
 "Kontroluji dostupné verze %s, aktualizuji odkazy v %s ...\n"
 "(Symbolické odkazy můžete měnit i ručně - viz `man ln'.)"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Přejmenovávám odkaz %s z %s na %s."
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "nelze přejmenovat %s na %s: %s"
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "závislý odkaz jménem %s byl duplikován"
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "Přejmenovávám závislý odkaz %s z %s na %s."
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 "Odstraňuji ručně zvolenou alternativu - přepínám do automatického režimu"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "Alternativa %s pro %s není registrována, neodstraňuji."
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Zahazuji zastaralý závislý odkaz %s (%s)."
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "Automatické aktualizace %s jsou zakázány, ponechávám bez změn."
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 "K automatickým aktualizacím se vrátíte příkazem `update-alternatives --auto %"
 "s'."
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Obnovuji z předchozí nefunkční aktualizace %s ..."
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "nelze otevřít %s pro zápis: %s"
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "Poslední balík pokytující %s (%s) byl odstraněn, mažu."
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5335,38 +5336,38 @@ msgstr ""
 "varování: %s má být symbolický odkaz na %s,\n"
 " avšak volání readlink selhalo: %s"
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "nelze se přesvědčit, že %s neexistuje: %s"
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "nelze vytvořit symbolický odkaz %s na %s: %s"
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "nelze nainstalovat %s jako %s: %s"
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "Ponechávám %s (%s), aby ukazoval na %s."
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "Aktualizuji %s (%s), aby ukazoval na %s."
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5375,13 +5376,13 @@ msgstr ""
 "varování: %s má být záviský symbolický odkaz na\n"
 " %s, avšak volání readlink selhalo: %s"
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "Odstraňuji %s (%s), neodpovídá %s."
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5390,7 +5391,7 @@ msgstr ""
 "Existuje pouze jediný program poskytující %s\n"
 "(%s). Nemám nic k nastavení.\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5399,7 +5400,7 @@ msgstr ""
 "Existuje pouze jediný program poskytující %s\n"
 "(%s). Nemám nic k nastavení.\n"
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5412,45 +5413,51 @@ msgstr ""
 "  Výběr        Alternativa\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr "Pro výchozí možnost[*] stiskněte enter, jinak zadejte číslo: "
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "Používám '%s' pro poskytnutí `%s'. "
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Nemohu najít alternativu `%s'."
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "chyba při zápisu na standardní výstup: %s"
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "nové řádky jsou v souborech update-alternatives zakázány (%s)"
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "chyba nebo konec souboru při čtení %s pro %s (%s)"
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, perl-format
 msgid "missing newline after %s"
 msgstr "chybí nový řádek za %s"
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Vážný problém: %s"
 
+#~ msgid "two modes specified: %s and --%s"
+#~ msgstr "zadány dva režimy: %s a --%s"
+
+#~ msgid "manflag"
+#~ msgstr "ruční příznak"
+
 #~ msgid "%s: failed to exec gzip -dc"
 #~ msgstr "%s: nelze spustit gzip -dc"
 
diff --git a/po/da.po b/po/da.po
index 55ccaf54..09f56e99 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: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+0300\n"
 "PO-Revision-Date: 2006-10-06 20:39+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
 "Language-Team: Danish\n"
@@ -4407,7 +4407,7 @@ msgid "unable to close %s after read: %s"
 msgstr "kunne ikke lukke %s efter læsning: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "kunne ikke lukke %s: %s"
@@ -4496,9 +4496,10 @@ msgstr ""
 "angivet.\n"
 "Pakkescripterne preinst/postrm skal altid angive --package og --divert.\n"
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
-#, perl-format
-msgid "two modes specified: %s and --%s"
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
+#, fuzzy, perl-format
+msgid "two commands specified: %s and --%s"
 msgstr "to tilstande angivet: %s og --%s"
 
 #: scripts/dpkg-divert.pl:111
@@ -4520,13 +4521,13 @@ msgid "package may not contain newlines"
 msgstr "pakke må ikke indeholde linjeskift"
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s kræver et <mappe>-parameter"
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "ukendt tilvalg '%s'"
@@ -4679,7 +4680,7 @@ msgstr "opret ny diversions-old: %s"
 msgid "install new diversions: %s"
 msgstr "installér nye omrokeringer: %s"
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "intern fejl:'%s ugyldig: %s"
@@ -5137,8 +5138,8 @@ msgstr ""
 "  --version                vis versionen.\n"
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
-msgstr "manflag"
+msgid "invalid update mode"
+msgstr ""
 
 #: scripts/update-alternatives.pl:135
 #, perl-format
@@ -5174,92 +5175,92 @@ msgstr ""
 "Alternativet for %s peger på %s - som ikke blev fundet. Fjerner den fra "
 "listen over alternativer."
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - status er %s."
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr " lænken peger for øjeblikket på %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr " lænken findes ikke i øjeblikket"
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " lænken er ulæselig - %s"
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - prioritet %s"
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr " slave %s: %s"
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 msgid "No versions available."
 msgstr "Ingen tilgængelige versioner."
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "Den bedste aktuelle version er  %s."
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "ukendt parameter '%s'"
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install kræver <lænke> <navn> <sti> <prioritet>"
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr "prioritet skal være et heltal"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s kræver <navn> <sti>"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s kræver <navn>"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave kræver <lænke> <navn> <sti>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "slavenavnet %s eksisterer flere gange"
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "slavelænken %s eksisterer flere gange"
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "navnet %s er både primær og slave"
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "lænken %s er både primær og slave"
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5267,31 +5268,31 @@ msgstr ""
 "kræver --display, --config, --set, --install, --remove, --all, --remove-all "
 "eller --auto"
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr "--slave er kun tilladt med --install"
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Ingen alternativer til %s."
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Sætter automatisk valg af %s op."
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "kunne ikke fjerne %s: %s"
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5300,7 +5301,7 @@ msgstr ""
 "%s er blevet ændret (manuelt eller af et script).\n"
 "Skifter til rent manuelle opdateringer."
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5309,69 +5310,69 @@ msgstr ""
 "Tjekker tilgængelige versioner af %s, opdaterer lænkgerne i %s ...\n"
 "(Du kan selv ændre de symbolske lænker der, hvis du vil - se 'man ln'.)"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Omdøber %s-lænke fra %s til %s."
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "kunne ikke omdøbe %s til %s: %s"
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "slavelænkenavnet %s findes flere gange"
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "Omdøber %s-slavelænke fra %s til %s."
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "Fjerner manuelt valgt alternativ - skifter til automatisk tilstand"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "Alternativet %s til %s er ikke registreret, fjerner ikke."
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Sletter den forældede slavelænke %s (%s)."
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "Automatiske opdateringer af %s er deaktiveret, lader den være."
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 "For at gå tilbage til automatiske opdateringer, skal du bruge 'update-"
 "alternatives --auto %s'."
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Genskaber fra tidligere mislykkede opdatering af '%s ..."
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "kunne ikke åbne %s for skrivning: %s"
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "Sidste pakke, der tilbød %s (%s), er fjernet. Sletter den."
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5380,38 +5381,38 @@ msgstr ""
 "advarsel: %s burde være en symbolsk lænke til %s\n"
 " (eller ikke eksisterende), men readlink fejlede: %s"
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "kunne ikke sikre at %s ikke fandtes: %s"
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "kunne ikke gøre %s til en symbolsk lænke til %s: %s"
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "kunne ikke installere %s som %s: %s"
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "Lader fortsat %s (%s) pege på %s."
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "Opdaterer %s (%s) til at pege på %s."
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5420,13 +5421,13 @@ msgstr ""
 "advarsel: %s burde være en symbolsk slave-lænke til\n"
 " %s, eller ikke eksistere. readlink mislykkedes: %s"
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "Fjernelse af %s (%s), er i modstrid med %s."
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5435,7 +5436,7 @@ msgstr ""
 "Der er kun et enkelt program, der giver %s\n"
 "(%s). Intet at sætte op.\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5444,7 +5445,7 @@ msgstr ""
 "Der er kun et enkelt program, der giver %s\n"
 "(%s). Intet at sætte op.\n"
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5457,47 +5458,53 @@ msgstr ""
 "  Valg         Alternativ\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 "Tryk retur for at beholde standardvalget[*], eller angiv nummeret på dit "
 "valg: "
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "Bruger `%s' til at give '%s'."
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Kan ikke finde alternativet '%s'."
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "fejl under skrivning til standard-ud: %s"
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "linjeskift er ikke tilladt i update-alternatives-filer (%s)"
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "fejl eller filafslutning under læsning af %s for %s (%s)"
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, perl-format
 msgid "missing newline after %s"
 msgstr "manglende linjeskift efter %s"
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Alvorligt problem: %s"
 
+#~ msgid "two modes specified: %s and --%s"
+#~ msgstr "to tilstande angivet: %s og --%s"
+
+#~ msgid "manflag"
+#~ msgstr "manflag"
+
 #~ msgid "%s: failed to exec gzip -dc"
 #~ msgstr "%s: kunne ikke udføre 'gzip -dc'"
 
diff --git a/po/de.po b/po/de.po
index 3f3409d7..debb5676 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.14.2\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+0300\n"
 "PO-Revision-Date: 2007-05-11 14:52+0200\n"
 "Last-Translator: Sven Joachim <svenjoac@gmx.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -4468,7 +4468,7 @@ msgid "unable to close %s after read: %s"
 msgstr "Kann %s nach dem Lesen nicht schließen: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "Kann %s nicht schließen: %s"
@@ -4559,9 +4559,10 @@ msgstr ""
 "falls angegeben. Paket-preinst/postrm-Skripte sollten immer --package\n"
 "und --divert angeben.\n"
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
-#, perl-format
-msgid "two modes specified: %s and --%s"
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
+#, fuzzy, perl-format
+msgid "two commands specified: %s and --%s"
 msgstr "Zwei Modi angegeben: %s und --%s"
 
 #: scripts/dpkg-divert.pl:111
@@ -4583,13 +4584,13 @@ msgid "package may not contain newlines"
 msgstr "Paketname darf keine Zeilenvorschübe enthalten"
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s benötigt ein Verzeichnis als Argument"
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "unbekannte Option »%s«"
@@ -4742,7 +4743,7 @@ msgstr "Anlegen von neuer diversions-old: %s"
 msgid "install new diversions: %s"
 msgstr "Installieren von neuer diversions: %s"
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "interner Fehler: %s defekt: %s"
@@ -5200,8 +5201,8 @@ msgstr ""
 "  --version                Version anzeigen.\n"
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
-msgstr "manflag"
+msgid "invalid update mode"
+msgstr ""
 
 #: scripts/update-alternatives.pl:135
 #, perl-format
@@ -5237,92 +5238,92 @@ msgstr ""
 "Alternative für %s verweist auf %s - was nicht gefunden wurde. Entferne es "
 "aus der Liste der Alternativen."
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - Status ist %s."
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr " Link verweist zur Zeit auf %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr " Link zur Zeit nicht vorhanden"
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " Link unlesbar - %s"
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - Priorität %s"
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr " Slave %s: %s"
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 msgid "No versions available."
 msgstr "Keine Versionen verfügbar."
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "Gegenwärtig »beste« Version ist %s."
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "unbekanntes Argument »%s«"
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install benötigt <Link> <Name> <Pfad> <Priorität>"
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr "Priorität muss eine Ganzzahl sein"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s benötigt <Name> <Pfad>"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s benötigt <Name>"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave benötigt <Link> <Name> <Pfad>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "doppelter Slave-Name %s"
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "doppelter Slave-Link %s"
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "Name %s ist sowohl primär als auch slave"
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "Link %s ist sowohl primär als auch slave"
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5330,31 +5331,31 @@ msgstr ""
 "brauche --display, --config, --set, --install, --remove, --all, --remove-all "
 "oder --auto"
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr "--slave ist nur mit --install erlaubt"
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Keine Alternativen für %s."
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Richte automatische Auswahl von %s ein."
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "Kann %s nicht entfernen: %s"
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5363,7 +5364,7 @@ msgstr ""
 "%s wurde geändert (manuell oder von einem Skript).\n"
 "Wechsle zu ausschließlich manuellen Aktualisierungen."
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5373,70 +5374,70 @@ msgstr ""
 "(Sie können die symbolischen Links dort selbst ändern, falls gewünscht - "
 "siehe »man ln«.)"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Benenne %s-Link von %s in %s um."
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "Kann %s nicht in %s umbenennen: %s"
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "Slave-Link Name %s doppelt"
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "Benenne %s-Slave-Link von %s in %s um."
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "Entferne manuell ausgewählte Alternative - wechsle zu Auto-Modus"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "Alternative %s für %s ist nicht registriert, wird nicht entfernt."
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Verwerfe veralteten Slave-Link %s (%s)."
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr ""
 "Automatische Aktualisierungen von %s sind deaktiviert, lasse es in Ruhe."
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 "Um zu automatischen Aktualisierungen zurückzukehren,\n"
 "verwenden Sie »update-alternatives --auto %s«."
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Behebe zuvor fehlgeschlagene Aktualisierung von %s ..."
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "Kann %s nicht zum Schreiben öffnen: %s"
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "Letztes Paket entfernt, das %s (%s) bereitstellte, lösche Alternative."
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5445,38 +5446,38 @@ msgstr ""
 "Warnung: %s sollte ein symbolischer Link auf %s sein\n"
 " (oder nicht existent); jedoch schlug readlink fehl: %s"
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "Kann nicht sicherstellen, dass %s nicht existiert: %s"
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "Kann %s nicht zu symbolischem Link auf %s machen: %s"
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "Kann %s nicht als %s installieren: %s"
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "Lasse %s (%s) weiterhin auf %s verweisen."
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "Aktualisiere %s (%s), auf %s zu verweisen."
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5485,13 +5486,13 @@ msgstr ""
 "Warnung: %s sollte ein symbolischer Slave-Link auf\n"
 " %s sein oder nicht existieren; jedoch schlug readlink fehl: %s"
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "Entferne %s (%s), nicht angebracht mit %s."
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5500,7 +5501,7 @@ msgstr ""
 "Es gibt kein Programm, welches %s bereitstellt.\n"
 "Nichts zu konfigurieren.\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5509,7 +5510,7 @@ msgstr ""
 "Es gibt nur 1 Programm, welches %s bereitstellt\n"
 "(%s). Nichts zu konfigurieren.\n"
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5522,43 +5523,49 @@ msgstr ""
 "  Auswahl      Alternative\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 "Drücken Sie die Eingabetaste, um die Vorgabe[*] beizubehalten,\n"
 "oder geben Sie die Auswahlnummer ein: "
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "Verwende »%s«, um »%s« bereitzustellen."
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Kann Alternative »%s« nicht finden."
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "Fehler beim Schreiben auf Standardausgabe: %s"
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "Zeilenvorschübe sind in update-alternatives-Dateien (%s) verboten"
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "Fehler oder EOF beim Lesen von %s für %s (%s)"
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, perl-format
 msgid "missing newline after %s"
 msgstr "fehlender Zeilenvorschub nach %s"
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Schwerwiegendes Problem: %s"
+
+#~ msgid "two modes specified: %s and --%s"
+#~ msgstr "Zwei Modi angegeben: %s und --%s"
+
+#~ msgid "manflag"
+#~ msgstr "manflag"
diff --git a/po/dpkg.pot b/po/dpkg.pot
index 510d1156..fac501cd 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: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+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"
@@ -3958,7 +3958,7 @@ msgid "unable to close %s after read: %s"
 msgstr ""
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr ""
@@ -4020,9 +4020,10 @@ msgid ""
 "divert.\n"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
 #, perl-format
-msgid "two modes specified: %s and --%s"
+msgid "two commands specified: %s and --%s"
 msgstr ""
 
 #: scripts/dpkg-divert.pl:111
@@ -4044,13 +4045,13 @@ msgid "package may not contain newlines"
 msgstr ""
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr ""
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, perl-format
 msgid "unknown option `%s'"
 msgstr ""
@@ -4195,7 +4196,7 @@ msgstr ""
 msgid "install new diversions: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr ""
@@ -4565,7 +4566,7 @@ msgid ""
 msgstr ""
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
+msgid "invalid update mode"
 msgstr ""
 
 #: scripts/update-alternatives.pl:135
@@ -4600,261 +4601,261 @@ msgid ""
 "alternatives."
 msgstr ""
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr ""
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 msgid "No versions available."
 msgstr ""
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr ""
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr ""
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, perl-format
 msgid "--%s needs <name>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
 msgstr ""
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr ""
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
 "Switching to manual updates only."
 msgstr ""
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
 "(You may modify the symlinks there yourself if desired - see `man ln'.)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr ""
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr ""
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr ""
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr ""
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
 " (or nonexistent); however, readlink failed: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
 " %s, or nonexistent; however, readlink failed: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, perl-format
 msgid ""
 "There is no program which provides %s.\n"
 "Nothing to configure.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
 "(%s). Nothing to configure.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -4863,41 +4864,41 @@ msgid ""
 "-----------------------------------------------\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, perl-format
 msgid "missing newline after %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr ""
diff --git a/po/dz.po b/po/dz.po
index e5dae289..4354a5f2 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg po.pot\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+0300\n"
 "PO-Revision-Date: 2006-09-19 11:37+0530\n"
 "Last-Translator: norbu <nor_den@hotmail.com>\n"
 "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -4418,7 +4418,7 @@ msgid "unable to close %s after read: %s"
 msgstr " %sལྷག་ཚར་བའི་ཤུལ་མ་ %s ཁ་བསྡམས་མ་ཚུགས།"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "%s ཁ་བསྡམ་མ་ཚུགས་: %s"
@@ -4509,9 +4509,10 @@ msgstr ""
 "ཐུམ་སྒྲིལ་ པི་རིནསིཊི་/པོསི་ཊིརམ་ ཡིག་ཚུགས་ཚུ་གིས་ཨ་རྟག་རང་ --ཐུམ་སྒྲིལ་དང་ and --ཁ་ཕྱོགས་སྒྱུར་བ་ "
 "གསལ་བཀོད་འབད་དགོ།\n"
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
-#, perl-format
-msgid "two modes specified: %s and --%s"
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
+#, fuzzy, perl-format
+msgid "two commands specified: %s and --%s"
 msgstr "ཐབས་ལམ་གཉིས་གསལ་བཀོད་འབད་ཡོདཔ: %s དང་ --%s"
 
 #: scripts/dpkg-divert.pl:111
@@ -4533,13 +4534,13 @@ msgid "package may not contain newlines"
 msgstr "ཐུམ་སྒྲིལ་ལུ་གྲལ་ཐིག་གསརཔ་མེདཔ་འོང་།"
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s ་ལུ་ <སྣོད་ཐོ་> སྒྲུབ་རྟགས་ཅིག་དགོཔ་འདུག"
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "མ་ཤེས་པའི་གདམ་ཁ་ `%s'"
@@ -4692,7 +4693,7 @@ msgstr "ཁ་སྒྱུར་གསརཔ་-རྙིངམ་གསར་
 msgid "install new diversions: %s"
 msgstr "ཁ་སྒྱུར་གསརཔ་གཞི་བཙུགས་འབད: %s"
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "ནང་འཁོད་ཀྱི་འཛོལ་བ: %s ངན་ཅན་བཟོ་ནི་: %s"
@@ -5146,8 +5147,8 @@ msgstr ""
 "  --ཐོན་རིམ་                ཐོན་རིམ་འདི་སྟོན།\n"
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
-msgstr "ལག་ཐོག་ཟུར་རྟགས།"
+msgid "invalid update mode"
+msgstr ""
 
 #: scripts/update-alternatives.pl:135
 #, perl-format
@@ -5182,92 +5183,92 @@ msgid ""
 msgstr ""
 "%s གི་དོན་ལུ་སྤེལ་མ་གིས་ འཚོལ་མ་འཐོབ་མི་ - %s ལུ་དཔགཔ་ཨིན། སྤེལ་མ་ཚུའི་ཐོ་ཡིག་ལས་རྩ་བསྐྲད་གཏང་དོ།"
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - གནས་ཚད་འདི་ %s ཨིན།"
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr "འབྲེལ་ལམ་འདི་ད་ལྟོ་ %s ལུ་དཔགཔ་ཨིན།"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr "འབྲེལ་ལམ་འདི་ད་ལྟོ་ཆད་ཨིན་པས།"
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr "འབྲེལ་ལམ་ལྷག་མ་བཏུབ་ - %s"
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - གཙོ་རིམ་ %s"
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr "བྲན་གཡོག་ %s: %s"
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 msgid "No versions available."
 msgstr "ཐོན་རིམ་ཚུ་ཐོབ་ཚུགསཔ་མེད།"
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "ད་ལྟོའི་ཐོན་རིམ་`དྲག་ཤོས་'འདི་ %s ཨིན།"
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "མ་ཤེས་པའི་སྒྲུབ་རྟགས་ `%s'"
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--གཞི་བཙུགས་ལུ་ <link> <name> <path> <priority> དགོཔ་ཨིན།"
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr "གཙོ་རིམ་འདི་ཧྲིལ་ཨང་ཅིག་ཨིན་དགོ"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s ལུ་ <name> <path> དགོཔ་ཨིན།"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s ལུ་ <name> དགོཔ་ཨིན།"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr "--བྲན་གཡོག་ལུ་ <link> <name> <path> དགོཔ་ཨིན།"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "བྲན་གཡོག་མིང་ %s རྫུན་མ་བཟོ་ཡོདཔ།"
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "བྲན་གཡོག་འབྲེལ་ལམ་ %s རྫུན་མ་བཟོ་ཡོདཔ།"
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "མིང་  %s འདི་གཞི་རིམ་དང་བྲན་གཡོག་གཉིས་ཆ་རང་ཨིན།"
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "འབྲེལ་ལམ་ %s འདི་ གཞི་རིམ་དང་བྲན་གཡོག་གཉིས་ཆ་རང་ཨིན།"
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5275,31 +5276,31 @@ msgstr ""
 "--བཀྲམ་སྟོན་ --རིམ་སྒྲིག་ --གཞི་སྒྲིག་ --གཞི་བཙུགས་ --རྩ་བསྐྲད་ --གེ་ར་ --གེ་ར་-རྩ་བསྐྲད་གཏང་ ཡང་"
 "ན་ --རང་བཞིན་ དགོཔ་ཨིན།"
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr "--བྲན་གཡོག་འདི་ --གཞི་བཙུགས་དང་ཅིག་ཁར་རྐྱངམ་ཅིག་འབད་ཆོགཔ་ཨིན།"
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "%s གི་དོན་ལུ་སྤེལ་མ་ཚུ་མེད།"
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "%s གི་རང་བཞིན་སེལ་འཐུ་གཞི་སྒྲིག་འབད་དོ།"
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "%s རྩ་བསྐྲད་གཏང་མ་ཚུགས: %s"
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5308,7 +5309,7 @@ msgstr ""
 "%s འདི་བསྐྱུར་བཅོས་འབད་ཡོདཔ་ཨིན།(ལག་ཐོག་ལས་ཡང་ན་ཡགི་ཚུགས་ཅིག་གིས་སྦེ་)\n"
 "ལག་དེབ་ཀྱི་དུས་མཐུན་ཚུ་ལུ་རྐྱངམ་ཅིག་སུ་ཡུ་ཅིང་འབད་དོ།"
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5318,68 +5319,68 @@ msgstr ""
 "(རེ་འདོད་ཡོདཔ་ཨིན་པ་ཅིན་ ཁྱོད་ཀྱིས་ཁྱོད་རང་གིས་ཕི་ནང་ལུ་བརྡ་མཚོན་འབྲེལ་ལམ་ཚུ་ལེགས་བཅོས་འབད་ཚུགས། -"
 "`man ln' བལྟ།)"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "%s འབྲེལ་ལམ་འདི་ %s ལས་ %s ལུ་བསྐྱར་མིང་བཏགས་དོ།"
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "%s འདི་ %s ལུ་བསྐྱར་མིང་བཏགས་མ་ཚུགས: %s "
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "བྲན་གཡོག་འབྲེལ་ལམ་མིང་ %s འདི་རྫུན་མ་བཟོ་ཡོདཔ།"
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "%s བྲན་གཡོག་བྲན་ལམ་འདི་ %s ལས་ %s ལུ་བསྐྱར་མིང་བཏགས་དོ།"
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 "ལག་ཐོག་ལས་སེལ་འཐུ་འབད་ཡོད་པའི་སྤེལ་མ་ - སུ་ཡི་ཅིང་འདི་རང་བཞིན་ཐབས་ལམ་ལུ་རྩ་བསྐྲད་གཏང་དོ།"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "%s གི་དོན་ལུ་སྤེལ་མ་ %s འདི་ཐོ་བཀོད་མ་འབད་བས། རྩ་བསྐྲད་མི་གཏང་།"
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "ཕན་མེད་བྲན་གཡོག་འབྲེལ་ལམ་ %s (%s) བཏོན་བཀོག་དོ།"
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "%s གི་རང་བཞིན་དུས་མཐུན་ཚུ་ལྕོགས་མིན་བཟོ་ཡོད། ཁོ་རང་རྐྱངམ་ཅིག་བཞག་པའི་སྐབས།"
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr "རང་བཞིན་ཚུ་ལུ་སླར་ལོག་ནིའི་དོན་ལས་  `དུས་མཐུན་-སྤེལ་མ་ --རང་བཞིན %s' ལག་ལེན་འཐབ།"
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "ཧེ་མའི་ %s གི་འཐུས་ཤོར་འབྱུང་མི་དུས་མཐུན་ལས་སླར་གསོ་འབད་དོ..."
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "འབྲི་ནིའི་དོན་ལུ་ %s ཁ་ཕྱེ་མ་ཚུགས: %s"
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "མཇུག་གི་ཐུམ་སྒྲིལ་ %s (%s) བྱིན་མིའདི་རྩ་ཙསྐྲད་གཏང་ཡོདཔ་ དེ་བཏོན་གཏངམ་ད་ལུ།"
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5388,38 +5389,38 @@ msgstr ""
 "ཉེན་བརྡ་: %s འདི་ %s ལུ་བརྡ་མཚོན་འབྲེལ་ལམ་ཅིག་ཨིན་དགོཔ་ཨིན་\n"
 "(ཡང་ན་གནས་པ་མིན་པ་) གང་ལྟར་ཡང་ རིཌི་ལིངཀ་ འཐུས་ཤོར་འབྱུང་ཡོདཔ: %s"
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "%s འདི་གནས་པ་མེནམ་སྦེ་ངེས་ཏིག་བཟོ་མ་ཚུགས: %s"
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "%s འདི་ %s ལུ་བརྡ་མཚོན་འབྲེལ་ལམ་ཅིག་བཟོ་མ་ཚུགས: %s "
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "%s འདི་ %s སྦེ་གཞི་བཙུགས་འབད་མ་ཚུགས: %s "
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "%s ལུ་དཔག་མི་ %s (%s) འདི་བཀོག་བཞག་དོ།"
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "%s (%s) འདི་ %s ལུ་དཔག་ནིའི་དོན་ལས་དུས་མཐུན་བཟོ་དོ།"
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5429,13 +5430,13 @@ msgstr ""
 "%s ཡང་ན གནས་པ་མིན་པ་ གི་བྲན་གཡོག་བརྡ་མཚོན་འབྲེལ་ལམ་ཨིན་དགོ་ གང་ལྟར་ཡང་ ལྷག་ནིའི་འབྲེལ་ལམ་འཐུས་"
 "ཤོར་འབྱོང་ཡོདཔ: %s"
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "%s (%s)    %s དང་ཅིག་ཁར་འོས་ལྡན་མེན་མི་ རྩ་བསྐྲད་གཏང་དོ།"
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5444,7 +5445,7 @@ msgstr ""
 "%s བྱིན་མི་ལས་རིམ་ ༡ རྐྱངམ་ཅིག་ཡོད།\n"
 "(%s)། རིམ་སྒྲིག་འབད་ནི་ག་ཅི་ཡང་མེད།\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5453,7 +5454,7 @@ msgstr ""
 "%s བྱིན་མི་ལས་རིམ་ ༡ རྐྱངམ་ཅིག་ཡོད།\n"
 "(%s)། རིམ་སྒྲིག་འབད་ནི་ག་ཅི་ཡང་མེད།\n"
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5466,45 +5467,51 @@ msgstr ""
 "   སེལ་འཐུ་   སྤེལ་མ\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr "སྔོན་སྒྲིག་[*]བཞག་ནིའི་དོན་ལས་ལོག་ལྡེ་ཨེབ་ ཡང་ན་སེལ་འཐུའི་ཨང་ཡིག་དཔར་རྐྱབས:"
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "`%s' བྱིན་ནིའི་དོན་ལས་ `%s' ལག་ལེན་འཐབ་དོ།"
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "སྤེལ་མ་ `%s' འཚོལ་མ་འཐོབ།"
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "stdout འབྲིཝ་ད་འཛོལ་བ: %s"
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "དུས་མཐུན་-སྤེལ་མའི་ཡིག་སྣོད་ཚུ་ (%s) ནང་ལུ་གྲལ་ཐིག་གསརཔ་ཚུ་བཀག་ཡོདཔ།"
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "%s (%s) གི་དོན་ལུ་ %s ལྷགཔ་ད་འཛོལ་བ་ཡང་ན་ཨི་ཨོ་ཨེཕ།"
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, perl-format
 msgid "missing newline after %s"
 msgstr "%s གི་ཤུལ་ལས་གྲལ་ཐིག་གསརཔ་བརླག་སྟོར་ཞུགས་ཡོདཔ།"
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "འཚུབ་ཅན་དཀའ་ངལ: %s"
 
+#~ msgid "two modes specified: %s and --%s"
+#~ msgstr "ཐབས་ལམ་གཉིས་གསལ་བཀོད་འབད་ཡོདཔ: %s དང་ --%s"
+
+#~ msgid "manflag"
+#~ msgstr "ལག་ཐོག་ཟུར་རྟགས།"
+
 #~ msgid "%s: failed to exec gzip -dc"
 #~ msgstr "%s: gzip -dc ལག་ལེན་འཐབ་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
diff --git a/po/el.po b/po/el.po
index 7c971102..db5437e6 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: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+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"
@@ -4385,7 +4385,7 @@ msgid "unable to close %s after read: %s"
 msgstr "αποτυχία κλεισίματος μετά την ανάγνωση: `%.255s'"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, fuzzy, perl-format
 msgid "unable to close %s: %s"
 msgstr "αδύνατη η εκτέλεση %s"
@@ -4447,9 +4447,10 @@ msgid ""
 "divert.\n"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
 #, perl-format
-msgid "two modes specified: %s and --%s"
+msgid "two commands specified: %s and --%s"
 msgstr ""
 
 #: scripts/dpkg-divert.pl:111
@@ -4472,13 +4473,13 @@ msgid "package may not contain newlines"
 msgstr "Το πακέτο `%s' δεν περιέχει κανένα αρχείο (!)\n"
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, fuzzy, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "η --build χρειάζεται ένα όρισμα καταλόγου"
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, fuzzy, perl-format
 msgid "unknown option `%s'"
 msgstr "άγνωστη επιλογή --%s"
@@ -4628,7 +4629,7 @@ msgstr "σφάλμα ανάγνωσης στο αρχείο diversions [i]"
 msgid "install new diversions: %s"
 msgstr "αδύνατη η εγκατάσταση της νέας έκδοσης του `%.255s'"
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, fuzzy, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "%s: εσωτερικό σφάλμα gzip: εγγραφή: `%s'"
@@ -5000,7 +5001,7 @@ msgid ""
 msgstr ""
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
+msgid "invalid update mode"
 msgstr ""
 
 #: scripts/update-alternatives.pl:135
@@ -5035,262 +5036,262 @@ msgid ""
 "alternatives."
 msgstr ""
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr ""
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 #, fuzzy
 msgid "No versions available."
 msgstr "(χωρίς διαθέσιμη περιγραφή)"
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, fuzzy, perl-format
 msgid "unknown argument `%s'"
 msgstr "άγνωστος τύπος συμπίεσης '%s'!"
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr ""
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, fuzzy, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "η --%s χρειάζεται ένα όρισμα ονόματος αρχείου .deb"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, fuzzy, perl-format
 msgid "--%s needs <name>"
 msgstr "η --%s δεν παίρνει ορίσματα"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
 msgstr ""
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr ""
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, fuzzy, perl-format
 msgid "unable to remove %s: %s"
 msgstr "αδύνατη η εκτέλεση %s"
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
 "Switching to manual updates only."
 msgstr ""
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
 "(You may modify the symlinks there yourself if desired - see `man ln'.)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, fuzzy, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Γίνεται αποσυμπίεση %s (από %s) ...\n"
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, fuzzy, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "αδύνατη η εύρεση κατάστασης του %s `%.250s'"
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr ""
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr ""
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr ""
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, fuzzy, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "αδύνατο το άνοιγμα του αρχείου πηγής `%.250s'"
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr ""
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
 " (or nonexistent); however, readlink failed: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, fuzzy, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "αδύνατη η εκτέλεση νέου %s"
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, fuzzy, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "αδυναμία δημιουργίας εφεδρικού δεσμού για `%.255s'"
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, fuzzy, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "αδύνατη η εγκατάσταση `%.250s' ως `%.250s'"
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
 " %s, or nonexistent; however, readlink failed: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
 "Nothing to configure.\n"
 msgstr "  %.250s παρέχει %.250s αλλά πρόκειται να απορρυθμιστεί.\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
 "(%s). Nothing to configure.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5299,42 +5300,42 @@ msgid ""
 "-----------------------------------------------\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, fuzzy, perl-format
 msgid "error writing stdout: %s"
 msgstr "σφάλμα κατά την εγγραφή `%s'"
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, fuzzy, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "σφάλμα ανάγνωσης του %s από %.255s"
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, fuzzy, perl-format
 msgid "missing newline after %s"
 msgstr ""
 "το αρχείο `%.250s' είναι κατεστραμμένο - αγνοείται newline μετά το %.250s"
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 9b8baa7c..da7c3473 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.13.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+0300\n"
 "PO-Revision-Date: 2006-09-14 02:25+0200\n"
 "Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -4596,7 +4596,7 @@ msgid "unable to close %s after read: %s"
 msgstr "fallo al cerrar %s después de la lectura: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "no se puede cerrar %s: %s"
@@ -4689,9 +4689,10 @@ msgstr ""
 "Los scripts preinst o postrm de los paquetes deberían siempre especificar\n"
 "--package y --divert.\n"
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
-#, perl-format
-msgid "two modes specified: %s and --%s"
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
+#, fuzzy, perl-format
+msgid "two commands specified: %s and --%s"
 msgstr "se han especificado dos modos: %s y --%s"
 
 #: scripts/dpkg-divert.pl:111
@@ -4713,13 +4714,13 @@ msgid "package may not contain newlines"
 msgstr "el nombre de paquete no puede tener saltos de línea"
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s necesita un directorio como parámetro"
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "opción `%s' desconocida"
@@ -4873,7 +4874,7 @@ msgstr "
 msgid "install new diversions: %s"
 msgstr "instalados nuevos desvíos: %s"
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "error interno: %s dañado: %s"
@@ -5352,8 +5353,8 @@ msgstr ""
 "  --version                muestra la versión.\n"
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
-msgstr "manflag"
+msgid "invalid update mode"
+msgstr ""
 
 #: scripts/update-alternatives.pl:135
 #, perl-format
@@ -5389,92 +5390,92 @@ msgstr ""
 "La alternativa para %s apunta a %s, pero no se encontró. Eliminándolo de la "
 "lista de alternativas."
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - el estado es %s."
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr " el enlace apunta actualmente a %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr " no hay enlace"
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " no se puede leer el enlace - %s"
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - prioridad %s"
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr " esclavo %s: %s"
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 msgid "No versions available."
 msgstr "No hay ninguna versión disponible."
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "Actualmente la «mejor» versión es %s."
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "argumento `%s' desconocido"
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install necesita <enlace> <nombre> <ruta> <prioridad>"
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr "el valor de prioridad debe ser un entero"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s necesita <nombre> <ruta>"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s necesita <nombre>"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave necesita <enlace> <nombre> <ruta>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "el nombre esclavo %s está duplicado"
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "el enlace esclavo %s está duplicado"
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "el nombre %s es al mismo tiempo principal y esclavo"
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "el enlace %s es al mismo tiempo principal y esclavo"
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5482,31 +5483,31 @@ msgstr ""
 "necesito --display, --config, --set, --install, --remove, --all, --remove-"
 "all o --auto"
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr "sólo se puede utilizar --slave con --install"
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "No hay alternativas para %s."
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Configurando la selección automática de %s."
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "no se puede eliminar %s: %s"
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5515,7 +5516,7 @@ msgstr ""
 "Se ha cambiado %s (manualmente o por un programa).\n"
 "Cambiando para realizar sólo actualizaciones manuales."
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5525,72 +5526,72 @@ msgstr ""
 "s ...\n"
 "(Puede modificar los enlaces allí si lo desea - consulte «man ln».)"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Renombrando el enlace %s de %s a %s."
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "no se puede renombrar %s a %s: %s"
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "el nombre del enlace esclavo %s está duplicado"
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "Renombrando el enlace esclavo %s de %s a %s."
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 "Eliminando la alternativa seleccionada manualmente, cambiando a modo "
 "automático"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "La alternativa %s para %s no está registrada, no se eliminará."
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Descartando el enlace esclavo obsoleto %s (%s)."
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr ""
 "Están deshabilitadads las actualizaciones automáticas de %s, no se tocará."
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 "Para volver a hacer actualizaciones automáticas utilice «update-alternatives "
 "--auto %s»."
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Restaurando de una actualización previa fallida de %s ..."
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "no se puede abrir el fichero %s para escritura: %s"
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "Se ha eliminado el último paquete proveía %s (%s), borrándolo."
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5599,38 +5600,38 @@ msgstr ""
 "aviso: se supone que %s es un enlace simbólico a %s\n"
 " (o no existe), sin embargo ha fallado «readlink»: %s"
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "no es posible asegurar que %s no exista: %s"
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "no se puede hace que %s sea un enlace simbólico para a %s: %s"
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "no se puede instalar %s como %s: %s"
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "Dejando %s (%s) para que apunte a %s."
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "Actualizando %s (%s) para que apunte a %s."
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5639,13 +5640,13 @@ msgstr ""
 "aviso: se supone que %s es un enlace simbólico a\n"
 " %s, o no existe; pero «readlink» ha fallado: %s"
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "Eliminando %s (%s), no es apropiado para %s."
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5654,7 +5655,7 @@ msgstr ""
 "Sólo hay un programa que provee %s\n"
 "(%s). No se configurará nada.\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5663,7 +5664,7 @@ msgstr ""
 "Sólo hay un programa que provee %s\n"
 "(%s). No se configurará nada.\n"
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5676,49 +5677,55 @@ msgstr ""
 "  Selección     Alternativa\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 "Pulse <Intro> para mantener el valor por omisión [*] o pulse un número de "
 "selección: "
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "Se utiliza `%s' para proveer `%s'."
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "No se encuentra una alternativa `%s'."
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "error al escribir a salida estándar: %s"
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 "no se pueden utilizar saltos de línea en los ficheros de update-alternatives "
 "(%s)"
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "error o fin de fichero al leer %s de %s (%s)"
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, perl-format
 msgid "missing newline after %s"
 msgstr "falta una nueva línea después de %s"
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Problema grave: %s"
 
+#~ msgid "two modes specified: %s and --%s"
+#~ msgstr "se han especificado dos modos: %s y --%s"
+
+#~ msgid "manflag"
+#~ msgstr "manflag"
+
 #~ msgid "%s: failed to exec gzip -dc"
 #~ msgstr "%s: fallo al ejecutar gzip -dc"
 
diff --git a/po/et.po b/po/et.po
index 99325c1e..ecccc3d4 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13.25\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+0300\n"
 "PO-Revision-Date: 2007-05-05 19:30+0300\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -4007,7 +4007,7 @@ msgid "unable to close %s after read: %s"
 msgstr "faili %s pole võimalik peale lugemist sulgeda: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "faili %s pole võimalik sulgeda: %s"
@@ -4072,9 +4072,10 @@ msgid ""
 "divert.\n"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
 #, perl-format
-msgid "two modes specified: %s and --%s"
+msgid "two commands specified: %s and --%s"
 msgstr ""
 
 #: scripts/dpkg-divert.pl:111
@@ -4096,13 +4097,13 @@ msgid "package may not contain newlines"
 msgstr ""
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s vajab argumenti <kataloog>"
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "tundmatu võti `%s'"
@@ -4247,7 +4248,7 @@ msgstr ""
 msgid "install new diversions: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "sisemine viga: %s on rikutud: %s"
@@ -4624,7 +4625,7 @@ msgid ""
 msgstr ""
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
+msgid "invalid update mode"
 msgstr ""
 
 #: scripts/update-alternatives.pl:135
@@ -4659,129 +4660,129 @@ msgid ""
 "alternatives."
 msgstr ""
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - olek on %s."
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr " viit osutab hetkel failile %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr ""
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - tähtsus %s"
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 msgid "No versions available."
 msgstr "Versioone pole saadaval."
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "Käesolevaga on `parim' versioon %s."
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "tundmatu argument `%s'"
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr ""
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s vajab argumente <nimi> <rada>"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s vajab argumenti <nimi>"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave vajab argumente <viit> <nimi> <rada>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
 msgstr ""
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr ""
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "%s jaoks pole alternatiive."
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Automaatse valiku seadmine %s jaoks."
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
 "Switching to manual updates only."
 msgstr ""
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -4791,121 +4792,121 @@ msgstr ""
 "uuendamine...\n"
 "(Soovi korral võid seak olevaid nimeviitasid ise muuta - vaata `man ln'.)"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Viida %s ümbernimetamine nimest %s nimega %s."
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "%s pole võimalik nimega %s ümber nimetada: %s"
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 "Käsitsi valitud alternatiivi eemaldamine - lülitumine automaatrežiimile"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "Alternatiivi %s pole %s jaoks registreeritud, ei eemalda."
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr ""
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "Automaatsed uuendused on %s jaoks keelatud, jätan muutmata."
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 "Automaatsetele uuendustele tagasilülitumiseks kasuta `update-alternatives --"
 "auto %s'."
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr ""
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "faili %s pole võimalik kirjutamiseks avada: %s"
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "Viimane pakk, mis tagab %s (%s) on eemaldatud, see kustutatakse."
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
 " (or nonexistent); however, readlink failed: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
 " %s, or nonexistent; however, readlink failed: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "%s (%s) eemaldamine, pole failiga %s sobilik."
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -4914,7 +4915,7 @@ msgstr ""
 "Süsteemis on ainult 1 programm, mis tagab %s\n"
 "(%s). Pole midagi seadistada.\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -4923,7 +4924,7 @@ msgstr ""
 "Süsteemis on ainult 1 programm, mis tagab %s\n"
 "(%s). Pole midagi seadistada.\n"
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -4936,43 +4937,43 @@ msgstr ""
 "      Valik    Alternatiiv\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 "Vaikimisi[*] valiku jaoks vajuta enter, oma valiku tegemiseks sisesta "
 "number: "
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "`%s' kasutamine `%s' tagamiseks."
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Alternatiivi `%s' pole võimalik leida."
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "viga standardväljundisse kirjutamisel: %s"
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, perl-format
 msgid "missing newline after %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Tõsine probleem: %s"
diff --git a/po/eu.po b/po/eu.po
index 0c76d67e..27aaf806 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg_po_eu\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+0300\n"
 "PO-Revision-Date: 2006-09-27 13:55+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: librezale <librezale@librezale.org>\n"
@@ -4459,7 +4459,7 @@ msgid "unable to close %s after read: %s"
 msgstr "ezin da irakurri ondoren %s itxi: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "Ezin da %s itxi: %s"
@@ -4549,9 +4549,10 @@ msgstr ""
 "Package preinst/postrm scripts should always specify --package and --"
 "divert.\n"
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
-#, perl-format
-msgid "two modes specified: %s and --%s"
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
+#, fuzzy, perl-format
+msgid "two commands specified: %s and --%s"
 msgstr "bi modu ezarri dira: %s eta --%s"
 
 #: scripts/dpkg-divert.pl:111
@@ -4573,13 +4574,13 @@ msgid "package may not contain newlines"
 msgstr "paketea ezin du lerro berririk eduki"
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s-(e)k <direktorio> argumentu bat behar du"
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "`%s' aukera ezezaguna"
@@ -4732,7 +4733,7 @@ msgstr "diversions-old berria sortu: %s"
 msgid "install new diversions: %s"
 msgstr "desbideraketa berriak instalatu: %s"
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "barne errorea: %s hondaturik: %s"
@@ -5186,8 +5187,8 @@ msgstr ""
 "  --version                bertsioa bistarazi.\n"
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
-msgstr "manflag"
+msgid "invalid update mode"
+msgstr ""
 
 #: scripts/update-alternatives.pl:135
 #, perl-format
@@ -5223,92 +5224,92 @@ msgstr ""
 "%s-ren alternatibak ez den aurkitzen %s-ra jotzen du. Aukera zerrendatik "
 "ezabatzen."
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - egoera %s da."
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr " loturak orain %s-ra darama"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr " lotura ez dago une honetan"
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " lotura irakurrezina - %s"
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - %s lehetasuna"
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr " %s morroia: %s"
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 msgid "No versions available."
 msgstr "ez dago bertsiorik eskuragarri."
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "Unekobertsio `onena' %s da."
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "`%s' argumentu ezezaguna"
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install-ek <lotura> <izena> <bidea> <lehentasuna> behar ditu"
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr "lehentasuna zenbaki oso bat izan behar da"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s-ek <izena> <bidea> behar ditu"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s-ek <izena> behar du"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave-ek <lotura> <izena> <bidea> behar ditu"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "%s izen morroia bikoizturik"
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "%s lotura morroia bikoizturik dago"
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "%s izena batera morroi eta nagusia da"
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "%s lotura batera morroi eta nagusia da"
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5316,31 +5317,31 @@ msgstr ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all "
 "edo --auto behar da"
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr "--slave --install-ekin batera bakarrik onartzen da"
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Ez dago alternatibarik %s-rentzat."
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "%s-ren hautatze automatikoa ezartzen."
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "ezin da %s ezabatu: %s"
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5349,7 +5350,7 @@ msgstr ""
 "%s aldatu egin da (eskuz edo script batez).\n"
 "Eskuzko eguneraketara aldatzen."
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5359,69 +5360,69 @@ msgstr ""
 "(lotura sinbolikoa aldatu beharko duzu zure kabuz, laguntza behar ezkero "
 "`man ln' begiratu.)"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "%s lotura %s-tik %s-ra berrizendatzen."
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "ezin da %s %s-ra berrizendatu: %s"
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "%s lotura morroi izena bikoizturik dago"
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "%s lotura morroia %s-tik %s-ra berrizendatzen."
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "Eskuz hautaturiko alternatiba ezabatzen - modu automatikora aldatzen"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "%s alternatiba %s-rentzat ez dago erregistraturik, ez da ezabatuko."
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "%s (%s) lotura morroi zaharra alde batetara uzten."
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "%s-ren eguneraketa automatikoak ezgaiturik daude, dagoen bezala uzten."
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 "Eguneraketa automatikoetara itzultzeko `update-alternatives --auto %s' "
 "erabili."
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Aurretik huts egindako  %s-ren eguneraketa batetik berreskuratzen"
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "Ezin da %s idazteko ireki: %s"
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "%s (%s) hornitzen duen azken paketea ezabaturik, ezabatzen."
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5430,38 +5431,38 @@ msgstr ""
 "abisua: %s %s-ra lotura sinboliko bat dela suposatzen\n"
 "da (edo ez dago), hala ere, rakurketak huts egin du: %s"
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "ezin da ziurtatu %s ez dagoenik: %s"
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "ezin da %s %s-ren lotura bat egin: %s"
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "Ezin da %s %s bezala instalatu: %s"
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "%s (%s)-ra lotzen %s utzi."
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "%s (%s) egunaratzen %s-ra jo dezan"
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5470,13 +5471,13 @@ msgstr ""
 "abisua: %s ez du oanrtzen %s-ra esteka sinboliko morroia\n"
 "izarea, edo ez dago, hala ere, lotura irakurtzeak huts egin du: %s"
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "%s (%s) ezabatzen, ez da %s-rekin egokia."
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5485,7 +5486,7 @@ msgstr ""
 "Programa 1 bakarrik dago %s (%s)-taz hornitzen\n"
 " duena. Ezer konfiguratzeko.\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5494,7 +5495,7 @@ msgstr ""
 "Programa 1 bakarrik dago %s (%s)-taz hornitzen\n"
 " duena. Ezer konfiguratzeko.\n"
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5507,46 +5508,52 @@ msgstr ""
 "Alternatiba aukeratu\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 "Enter sakatu lehenespena mantentzeko[*], edo hautatze zenbakia sakatu: "
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "`%s' erabiltzen `%s'-etaz hornitzeko."
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Ezin da `%s' ordezkorik aurkitu."
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "errorea irteera estandarrean idazterakoan: %s"
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "update-alternatives fitxategiak (%s) ezin du lerro berririk eduki"
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "fixtategi amaiera edo errorea %s irakurtzean %s-rako (%s)"
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, perl-format
 msgid "missing newline after %s"
 msgstr "lerro berria falta da %s ondoren"
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Arazo larria: %s"
 
+#~ msgid "two modes specified: %s and --%s"
+#~ msgstr "bi modu ezarri dira: %s eta --%s"
+
+#~ msgid "manflag"
+#~ msgstr "manflag"
+
 #~ msgid "%s: failed to exec gzip -dc"
 #~ msgstr "%s: huts egin du exekutatzean: gzip -dc"
 
diff --git a/po/fr.po b/po/fr.po
index 7426e48a..82ef3319 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -23,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-05-09 21:06+0300\n"
-"PO-Revision-Date: 2007-05-02 22:30+0200\n"
+"POT-Creation-Date: 2007-05-15 15:52+0300\n"
+"PO-Revision-Date: 2007-05-15 15:59+0300\n"
 "Last-Translator: Frederic Bothamy <frederic.bothamy@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -4666,7 +4666,7 @@ msgid "unable to close %s after read: %s"
 msgstr "impossible de fermer %s après lecture : %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "impossible de fermer %s : %s"
@@ -4761,9 +4761,10 @@ msgstr ""
 "spécifier\n"
 "--package et --divert.\n"
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
-#, perl-format
-msgid "two modes specified: %s and --%s"
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
+#, fuzzy, perl-format
+msgid "two commands specified: %s and --%s"
 msgstr "deux modes spécifiés : %s et --%s"
 
 #: scripts/dpkg-divert.pl:111
@@ -4785,13 +4786,13 @@ msgid "package may not contain newlines"
 msgstr "le paquet ne peut pas contenir de retour chariot"
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s a besoin d'un paramètre <répertoire>"
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "option « %s » inconnue"
@@ -4944,7 +4945,7 @@ msgstr "
 msgid "install new diversions: %s"
 msgstr "installation des nouvelles diversions : %s"
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "erreur interne : %s corrompu : %s"
@@ -5419,8 +5420,8 @@ msgstr ""
 "  --version                afficher la version.\n"
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
-msgstr "manflag"
+msgid "invalid update mode"
+msgstr ""
 
 #: scripts/update-alternatives.pl:135
 #, perl-format
@@ -5456,92 +5457,92 @@ msgstr ""
 "L'alternative pour %s pointe sur %s - qui n'a pas été trouvé. Suppression de "
 "la liste des alternatives."
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - l'état est %s."
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr " le lien pointe actuellement sur %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr " le lien est actuellement absent"
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " lien non lisible - %s"
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - priorité %s"
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr " lien secondaire %s : %s"
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 msgid "No versions available."
 msgstr "Aucune version disponible."
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "La « meilleure » version actuelle est %s."
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "paramètre inconnu « %s »"
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install a besoin de <lien> <nom> <chemin> <priorité>"
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr "la priorité doit être un entier"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s a besoin de <nom> <chemin>"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s a besoin de <nom>"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave a besoin de <lien> <nom> <chemin>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "le nom secondaire (« slave ») %s est dupliqué"
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "le lien secondaire (« slave ») %s est dupliqué"
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "le nom %s est à la fois principal et secondaire"
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "le lien %s est à la fois principal et secondaire"
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5549,31 +5550,31 @@ msgstr ""
 "a besoin de --display, --config, --set, --install, --remove, --all, --remove-"
 "all ou --auto"
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr "--slave n'est autorisé qu'avec --install"
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Pas d'alternatives pour %s."
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Configuration de la sélection automatique pour %s."
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "impossible de supprimer %s : %s"
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5582,7 +5583,7 @@ msgstr ""
 "%s a été changé (manuellement ou par un script).\n"
 "Bascule vers des mises à jour manuelles uniquement."
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5594,71 +5595,71 @@ msgstr ""
 "-\n"
 "voir « man ln »)."
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Renommage du lien %s de %s en %s."
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "impossible de renommer %s en %s : %s"
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "nom de lien secondaire %s dupliqué"
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "Renommage du lien secondaire %s de %s vers %s."
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 "Suppression de l'alternative sélectionnée manuellement - bascule vers le "
 "mode automatique"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "L'alternative %s pour %s n'est pas enregistrée, pas de suppression."
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Abandon du lien secondaire obsolète %s (%s)."
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "Les mises à jour automatiques de %s sont désactivées, conservation."
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 "Pour revenir aux mises à jour automatiques, utilisez « update-alternatives --"
 "auto %s »."
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Récupération de la précédente mise à jour défectueuse de %s..."
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "impossible d'ouvrir %s en écriture : %s"
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "Dernier paquet fournissant %s (%s) supprimé, suppression de celui-ci."
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5667,38 +5668,38 @@ msgstr ""
 "Avertissement : %s est censé être un lien symbolique vers %s\n"
 " (ou non existant) ; cependant, échec de readlink : %s"
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "impossible de garantir l'inexistence de %s : %s"
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "impossible de faire de %s un lien symbolique vers %s : %s"
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "impossible d'installer %s en tant que %s : %s"
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "Conservation de %s (%s) pointant sur %s."
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "Mise à jour de %s (%s) pointant sur %s."
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5707,13 +5708,13 @@ msgstr ""
 "avertissement : %s est censé être un lien symbolique secondaire vers\n"
 "%s ou ne pas exister ; cependant, échec de readlink : %s"
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "Suppression de %s (%s), non approprié avec %s."
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5722,7 +5723,7 @@ msgstr ""
 "Il n'y a aucun programme fournissant %s.\n"
 "Rien à configurer.\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5731,7 +5732,7 @@ msgstr ""
 "Il n'y a qu'un programme fournissant %s (%s).\n"
 "Rien à configurer.\n"
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5744,48 +5745,54 @@ msgstr ""
 "  Sélection    Alternative\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 "Appuyez sur Entrée pour conserver la valeur par défaut[*] ou choisissez le "
 "numéro sélectionné :"
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "Utilisation de « %s » pour fournir « %s »."
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Impossible de trouver l'alternative « %s »."
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "erreur d'écriture sur la sortie standard : %s"
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 "Les retours chariot sont interdits dans des fichiers update-alternatives (%s)"
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "erreur ou fin de fichier lors de la lecture de %s pour %s (%s)"
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, perl-format
 msgid "missing newline after %s"
 msgstr "retour chariot absent après %s"
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Problème grave : %s"
 
+#~ msgid "two modes specified: %s and --%s"
+#~ msgstr "deux modes spécifiés : %s et --%s"
+
+#~ msgid "manflag"
+#~ msgstr "manflag"
+
 #~ msgid "%s: failed to exec gzip -dc"
 #~ msgstr "%s : impossible d'exécuter « gzip -dc »"
 
diff --git a/po/gl.po b/po/gl.po
index c3dae48d..d31c4c57 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: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+0300\n"
 "PO-Revision-Date: 2006-08-18 09:52+0200\n"
 "Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -4503,7 +4503,7 @@ msgid "unable to close %s after read: %s"
 msgstr "non se pode pechar %s trala lectura: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "non se pode pechar %s: %s"
@@ -4592,9 +4592,10 @@ msgstr ""
 "Ao eliminar deben encaixar --package ou --local e --divert se se indican.\n"
 "Os scripts de preinst/postrm deberían especificar --package e --divert.\n"
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
-#, perl-format
-msgid "two modes specified: %s and --%s"
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
+#, fuzzy, perl-format
+msgid "two commands specified: %s and --%s"
 msgstr "especificáronse dous modos: %s e --%s"
 
 #: scripts/dpkg-divert.pl:111
@@ -4616,13 +4617,13 @@ msgid "package may not contain newlines"
 msgstr "o nome do paquete non pode conter saltos de liña"
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s precisa dun argumento de directorio"
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "opción \"%s\" descoñecida"
@@ -4775,7 +4776,7 @@ msgstr "creación do novo ficheiro diversions-old: %s"
 msgid "install new diversions: %s"
 msgstr "instalación de novos desvíos: %s"
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "erro interno: %s está corrompido: %s"
@@ -5233,8 +5234,8 @@ msgstr ""
 "  --version                amosa a versión.\n"
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
-msgstr "manflag"
+msgid "invalid update mode"
+msgstr ""
 
 #: scripts/update-alternatives.pl:135
 #, perl-format
@@ -5270,92 +5271,92 @@ msgstr ""
 "A alternativa de %s apunta a %s, que non se atopou. Elimínase da lista de "
 "alternativas."
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - o estado é %s."
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr " a ligazón apunta a %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr " a ligazón está ausente"
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " ligazón ilexible - %s"
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - prioridade %s"
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr " escravo %s: %s"
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 msgid "No versions available."
 msgstr "Non hia ningunha versión dispoñible."
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "A versión \"mellor\" actual é %s."
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "argumento \"%s\" descoñecido"
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install precisa dos argumentos de ligazón, nome, ruta e prioridade"
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr "a prioridade ten que ser un número enteiro"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s precisa dos argumentos de nome e ruta"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s precisa do argumento de nome"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave precisa dos argumentos de ligazón, nome e ruta"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "nome de escravo %s duplicado"
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "ligazón escrava %s duplicada"
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "o nome %s é primario e escravo ao mesmo tempo"
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "a ligazón %s é primaria e escrava ao mesmo tempo"
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5363,31 +5364,31 @@ msgstr ""
 "precísase de --display, --config, --set, --install, --remove, --all, --"
 "remove-all ou -auto"
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr "só se admite --slave con --install"
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Non hai alternativas para %s."
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "A estabrecer a selección automática de %s."
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "non se pode eliminar %s: %s"
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5396,7 +5397,7 @@ msgstr ""
 "%s cambiou (manualmente ou mediante un script).\n"
 "Cámbiase a só actualizacións manuais."
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5406,71 +5407,71 @@ msgstr ""
 "s ...\n"
 "(Pode modificar as ligazóns vostede se o prefire - consulte \"man ln\")."
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "A cambiar o nome da ligazón %s de %s a %s."
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "non se pode cambiar o nome de %s a %s: %s"
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "nome de ligazón escrava %s duplicado"
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "A cambiar o nome da ligazón escrava %s de %s a %s."
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 "A eliminar a alternativa seleccionada manualmente - cámbiase a modo "
 "automático."
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "A alternativa %s de %s non está rexistrada, non se elimina."
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "A descargar a ligazón escrava obsoleta %s (%s)."
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "As actualizacións automáticas de %s están desactivadas, omítese."
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 "Para voltar ás actualizacións automáticas empregue \"update-alternatives --"
 "auto %s\"."
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "A recuperarse dunha anterior actualización fallida de %s ..."
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "non se pode abrir %s para escritura: %s"
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "Eliminouse o derradeiro ficheiro que fornecía %s (%s), a eliminalo."
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5479,38 +5480,38 @@ msgstr ""
 "aviso: suponse que %s é unha ligazón simbólica a %s\n"
 "  (ou que non existe); nembargantes, non se puido ler a ligazón: %s"
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "non se pode asegurar que %s non exista: %s"
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "non se pode converter %s nunha ligazón simbólica a %s: %s"
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "non se pode instalar %s coma %s: %s"
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "Déixase %s (%s) apuntando a %s."
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "A actualizar %s (%s) para que apunte a %s."
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5519,13 +5520,13 @@ msgstr ""
 "aviso: suponse que %s é unha ligazón simbólica escrava a\n"
 "  %s, ou que non existe; nembargantes, non se puido ler a ligazón: %s"
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "A eliminar %s (%s); non é apropiado con %s."
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5534,7 +5535,7 @@ msgstr ""
 "Só hai un programa que forneza %s\n"
 "(%s). Non hai nada que configurar.\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5543,7 +5544,7 @@ msgstr ""
 "Só hai un programa que forneza %s\n"
 "(%s). Non hai nada que configurar.\n"
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5556,48 +5557,54 @@ msgstr ""
 "  Selección    Alternativa\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 "Prema Intro para manter o valor por defecto[*] ou escriba o número da "
 "escolla: "
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "A empregar \"%s\" para fornecer \"%s\"."
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Non se pode atopar a alternativa \"%s\"."
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "erro ao gravar na saída estándar: %s"
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 "non se admiten saltos de liña nos ficheiros de update-alternatives (%s)"
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "erro ou fin de ficheiro ao ler de %s para %s (%s)"
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, perl-format
 msgid "missing newline after %s"
 msgstr "falla un salto de liña despois de %s"
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Problema grave: %s"
 
+#~ msgid "two modes specified: %s and --%s"
+#~ msgstr "especificáronse dous modos: %s e --%s"
+
+#~ msgid "manflag"
+#~ msgstr "manflag"
+
 #~ msgid "%s: failed to exec gzip -dc"
 #~ msgstr "%s: non se puido executar gzip -dc"
 
diff --git a/po/hu.po b/po/hu.po
index 2b189efc..ff84151b 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+0300\n"
 "PO-Revision-Date: 2006-10-21 23:19+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: hu\n"
@@ -4368,7 +4368,7 @@ msgid "unable to close %s after read: %s"
 msgstr "nem tudom lezárni %s-t olvasás után: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "nem tudom lezárni %s-t: %s"
@@ -4433,9 +4433,10 @@ msgid ""
 "divert.\n"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
-#, perl-format
-msgid "two modes specified: %s and --%s"
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
+#, fuzzy, perl-format
+msgid "two commands specified: %s and --%s"
 msgstr "2 mód megadva: %s és --%s"
 
 #: scripts/dpkg-divert.pl:111
@@ -4457,13 +4458,13 @@ msgid "package may not contain newlines"
 msgstr "csomag nem tartalmazhat újsorokat"
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s egy <könyvtár> argumentumot vár"
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "ismeretlen `%s' lehetőség"
@@ -4616,7 +4617,7 @@ msgstr "új diversions-old létrehozása: %s"
 msgid "install new diversions: %s"
 msgstr "új eltérítések telepítése: %s"
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "belső hiba: %s rossz: %s"
@@ -5032,8 +5033,8 @@ msgid ""
 msgstr ""
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
-msgstr "manflag"
+msgid "invalid update mode"
+msgstr ""
 
 #: scripts/update-alternatives.pl:135
 #, perl-format
@@ -5069,92 +5070,92 @@ msgstr ""
 "%s választása erre mutat: %s - melyet nem leltem. Eltávolítom a választási "
 "listából."
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - állapot: %s."
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr " lánc most ide mutat: %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr " lánc most hiányzik"
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " lánc olvashatatlan - %s"
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - %s elsőbbség"
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr " %s szolga: %s"
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 msgid "No versions available."
 msgstr "Nincs elérhető verzió."
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "A jelenlegi `legjobb' verzió: %s"
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "ismeretlen %s argumentum"
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "a --install követelményei: <lánc> <név> <ösvény> <elsőbbség>"
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr "az elsőbbség egész szám kell legyen"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s számára <név> és <ösvény> kell"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s számára <név> kell"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr "a --slave követelményei: <lánc> <név> <ösvény>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "%s szolga név megkettőzött"
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "%s szolga lánc megkettőzött"
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "%s elsődleges és szolga név is"
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "%s elsődleges és szolga lánc is"
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5162,31 +5163,31 @@ msgstr ""
 "igénye --display, --config, --set, --install, --remove, --all, --remove-all "
 "vagy --auto"
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr "a --slave csak --install mellett engedélyezett"
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Nincs kiválasztás erre: %s."
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "%s automata kijelölésének beállítása."
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "nem tudom törölni %s-t: %s"
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5195,7 +5196,7 @@ msgstr ""
 "%s-t módosítottad (kézzel vagy egy parancsfájllal).\n"
 "Csak-kézi-frissítésre váltok."
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5204,120 +5205,120 @@ msgstr ""
 "%s elérhető verziói ellenőrzése, láncok frissítése itt: %s ...\n"
 "(Magad is módosíthatod ezeket - lásd a `man ln'-t.)"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "%s lánc átnevezése erről: %s erre: %s."
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "nem tudom átnevezni %s-t erre: %s: %s"
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "%s szolga lánc név megkettőzött"
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "%s szolga lánc név átnevezése innen: %s ide: %s"
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "Kézi kiválasztás törlése - automata módra váltok"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "%s kiválasztása ehhez: %s nincs bejegyezve, nem törlöm"
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Elavult %s szolga lánc átugrása (%s)."
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "%s automata frissítései kikapcsolva, magára hagyom."
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 "Az automatikus frissítésekhez való visszatéréshez használd az `update-"
 "alternatives --auto %s'-t"
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "%s előző sikertelen frissítésének visszaállítása..."
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "nem tudom megnyitni %s-t írásra: %s"
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "Utolsó %s-t (%s) adó csomag eltávolítva, törlöm."
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
 " (or nonexistent); however, readlink failed: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "nem biztos, hogy %s nem létezik: %s"
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "%s jlánc készítése ide: %s nem sikerült: %s"
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "nem sikerült telepíteni %s-t mint %s: %s"
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "Meghagyom %s (%s)-t ezen: %s"
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "Frissítem %s (%s)-t erre: %s"
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
 " %s, or nonexistent; however, readlink failed: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "Törlöm %s (%s)-t, nem illik ehhez: %s."
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5326,7 +5327,7 @@ msgstr ""
 "Csak 1 program adja ezt: %s\n"
 "(%s). Nincs beállítandó.\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5335,7 +5336,7 @@ msgstr ""
 "Csak 1 program adja ezt: %s\n"
 "(%s). Nincs beállítandó.\n"
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5348,45 +5349,51 @@ msgstr ""
 "  Kijelölés    Választás\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr "Üss entert az alap[*]-hoz, vagy a választás számát: "
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "`%s' használata `%s' számára."
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Nem találom a `%s' kiválasztást"
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "hiba stdout íráskor: %s"
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "újsorok tilosak az update-alternatives fájlokban (%s)"
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "eof hiba %s olvasásakor ehhez: %s (%s)"
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, perl-format
 msgid "missing newline after %s"
 msgstr "hiányzó új sor ezután: %s"
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Komoly gond: %s"
 
+#~ msgid "two modes specified: %s and --%s"
+#~ msgstr "2 mód megadva: %s és --%s"
+
+#~ msgid "manflag"
+#~ msgstr "manflag"
+
 #~ msgid "%s: failed to exec gzip -dc"
 #~ msgstr "%s: sikertelen gzip -dc futtatás"
 
diff --git a/po/id.po b/po/id.po
index b24130ca..0f9ee50c 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: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+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."
@@ -4298,7 +4298,7 @@ msgid "unable to close %s after read: %s"
 msgstr "gagal menutup setelah membaca: `%.255s'"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, fuzzy, perl-format
 msgid "unable to close %s: %s"
 msgstr "tidak bisa menjalankan perintah %s"
@@ -4360,9 +4360,10 @@ msgid ""
 "divert.\n"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
 #, perl-format
-msgid "two modes specified: %s and --%s"
+msgid "two commands specified: %s and --%s"
 msgstr ""
 
 #: scripts/dpkg-divert.pl:111
@@ -4385,13 +4386,13 @@ msgid "package may not contain newlines"
 msgstr "Paket `%s' tidak berisi suatu berkas pun!\n"
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, fuzzy, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--build butuh sebuah argumen direktori"
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, fuzzy, perl-format
 msgid "unknown option `%s'"
 msgstr "pilihan --%s tak dikenal"
@@ -4540,7 +4541,7 @@ msgstr "Ada kesalahan membaca 'diversions' [i]"
 msgid "install new diversions: %s"
 msgstr "tidak bisa memasang versi baru dari `%.255s'"
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, fuzzy, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "%s: ada kesalahan gzip internal: write: `%s'"
@@ -4912,7 +4913,7 @@ msgid ""
 msgstr ""
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
+msgid "invalid update mode"
 msgstr ""
 
 #: scripts/update-alternatives.pl:135
@@ -4947,262 +4948,262 @@ msgid ""
 "alternatives."
 msgstr ""
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr ""
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 #, fuzzy
 msgid "No versions available."
 msgstr "(tidak ada keterangan yang tersedia)"
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, fuzzy, perl-format
 msgid "unknown argument `%s'"
 msgstr "jenis kompresi `%s' tidak dikenal!"
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr ""
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, fuzzy, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s butuh suatu argumen nama berkas .deb"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, fuzzy, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s tidak perlu argumen"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
 msgstr ""
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr ""
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, fuzzy, perl-format
 msgid "unable to remove %s: %s"
 msgstr "tidak bisa menjalankan perintah %s"
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
 "Switching to manual updates only."
 msgstr ""
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
 "(You may modify the symlinks there yourself if desired - see `man ln'.)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, fuzzy, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Sedang membuka paket %s (dari %s) ... \n"
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, fuzzy, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "gagal melakukan 'stat' %s `%.250s'"
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr ""
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr ""
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr ""
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, fuzzy, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "gagal membuka berkas sumber %.250s'"
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr ""
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
 " (or nonexistent); however, readlink failed: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, fuzzy, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "tidak bisa menjalankan %s baru"
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, fuzzy, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "tidak bisa membuat symlink cadangan untuk `%.255s'"
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, fuzzy, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "tidak bisa memasang `%.250s' sebagai `%.250s'"
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
 " %s, or nonexistent; however, readlink failed: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
 "Nothing to configure.\n"
 msgstr "   %.250s menyediakan %.250s tetapi akan didekonfigurasi.\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
 "(%s). Nothing to configure.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5211,41 +5212,41 @@ msgid ""
 "-----------------------------------------------\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, fuzzy, perl-format
 msgid "error writing stdout: %s"
 msgstr "Ada kesalahan saat menulis `%s'"
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, fuzzy, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "ada kesalahan saat membaca %s dari %.255s"
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, fuzzy, perl-format
 msgid "missing newline after %s"
 msgstr "berkas `%.250s' terkorupsi - baris-baru hilang setelah %.250s"
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 65debbe0..943c09a9 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: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+0300\n"
 "PO-Revision-Date: 2006-09-09 15:11+0200\n"
 "Last-Translator: Stefano Canepa <sc@linux.it>\n"
 "Language-Team: italian <debian-l10n-italian@debian.org>\n"
@@ -4570,7 +4570,7 @@ msgid "unable to close %s after read: %s"
 msgstr "impossibile chiudere %s dopo la lettura: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "impossibile chiudere %s: %s"
@@ -4663,9 +4663,10 @@ msgstr ""
 "Gli script preinst/postrm del pacchetto devono sempre specificare --package "
 "e --divert.\n"
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
-#, perl-format
-msgid "two modes specified: %s and --%s"
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
+#, fuzzy, perl-format
+msgid "two commands specified: %s and --%s"
 msgstr "sono state specificate due modalità: %s e --%s"
 
 #: scripts/dpkg-divert.pl:111
@@ -4687,13 +4688,13 @@ msgid "package may not contain newlines"
 msgstr "pacchetto non può contenere a-capo"
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s richiede il nome di una directory come parametro"
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "opzione `%s' non riconosciuta"
@@ -4846,7 +4847,7 @@ msgstr "creazione nuovo diversions-old: %s"
 msgid "install new diversions: %s"
 msgstr "installazione nuovo diversions: %s"
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "errore interno: %s è corrotto: %s"
@@ -5311,8 +5312,8 @@ msgstr ""
 "  --version                mostra la versione.\n"
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
-msgstr "manflag"
+msgid "invalid update mode"
+msgstr ""
 
 #: scripts/update-alternatives.pl:135
 #, perl-format
@@ -5348,92 +5349,92 @@ msgstr ""
 "L'alternativa per %s punta a %s, che non è stato trovato.  La rimuovo dalla "
 "lista delle alternative."
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - lo status è %s."
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr " il link attualmente punta a %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr " il link attualmente non c'è"
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " link illeggibile - %s"
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - priorità %s"
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr " slave %s: %s"
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 msgid "No versions available."
 msgstr "Nessuna versione disponibile."
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "La `migliore' versione attualmente è %s."
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "parametro sconosciuto `%s'"
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install necessita di <link> <nome> <percorso> <priorità>"
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr "la priorità deve essere un numero intero"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s richiede <nome> e <percorso>"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s necessita di <nome>"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave necessita di <link> <nome> <percorso>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "nome slave %s duplicato"
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "link slave %s duplicato"
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "il nome %s è sia primario che slave"
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "il link %s è sia primario che slave"
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5441,31 +5442,31 @@ msgstr ""
 "necessita --display, --config, --set, --install, --remove, --all, --remove-"
 "all o --auto"
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr "--slave è consentito solo con --install"
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Nessuna alternativa per %s."
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Imposto la selezione automatica di %s."
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "impossibile rimuovere %s: %s"
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5474,7 +5475,7 @@ msgstr ""
 "%s è stato modificato (da te o da uno script).\n"
 "Passo all'aggiornamento esclusivamente manuale."
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5484,69 +5485,69 @@ msgstr ""
 "(Se desideri puoi modificare direttamente quei link simbolici, vedi `man "
 "ln'.)"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Rinomino il link %s da %s a %s."
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "impossibile rinominare %s a %s: %s"
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "nome link slave %s duplicato"
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "Rinomino il link slave %s da %s a %s."
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 "Rimuovo le alternative selezionte manualmente, passo alla modalità automatica"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "L'alternativa %s per %s non è registrata, non la rimuovo."
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Scarto il link slave obsoleto %s (%s)."
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "L'aggiornamento automatico di %s è disattivato, lo lascio stare."
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 "Per tornare all'aggiornamento automatico usa `update-alternatives --auto %s'."
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Ripristino da un precedente aggiornamento fallito di %s ..."
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "impossibile aprire %s in scrittura: %s"
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "L'ultimo pacchetto che fornisce %s (%s) è stato rimosso, lo elimino."
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5555,38 +5556,38 @@ msgstr ""
 "attenzione: %s dovrebbe essere un symlink a %s\n"
 " (o non esistere affatto); invece, readlink è fallita: %s"
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "impossibile assicurare che %s non esiste: %s"
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "impossibile creare il collegamento simbolico %s a %s: %s"
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "impossibile installare %s come %s: %s"
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "Lascio %s (%s) puntare a %s."
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "Aggiorno %s (%s) che punti a %s."
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5595,13 +5596,13 @@ msgstr ""
 "attenzione: %s dovrebbe essere un symlink slave a %s,\n"
 " o non esistere; invece, readlink è fallita: %s"
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "Rimuovo %s (%s), non appropriato con %s."
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5610,7 +5611,7 @@ msgstr ""
 "C'è un solo programma che fornisce %s\n"
 "(%s). Non c'è nulla da configurare.\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5619,7 +5620,7 @@ msgstr ""
 "C'è un solo programma che fornisce %s\n"
 "(%s). Non c'è nulla da configurare.\n"
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5632,47 +5633,53 @@ msgstr ""
 "  Selezione    Alternativa\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 "Premi invio per mantenere il default[*], o inserisci il numero da "
 "selezionare:"
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "Uso `%s' per fornire `%s'."
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Non riesco a trovare l'alternativa `%s'."
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "errore scrivendo su stdout: %s"
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "gli a-capo non sono consentiti nei file update-alternatives (%s)"
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "errore o eof leggendo %s per %s (%s)"
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, perl-format
 msgid "missing newline after %s"
 msgstr "manca un a-capo dopo %s"
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Problema grave: %s"
 
+#~ msgid "two modes specified: %s and --%s"
+#~ msgstr "sono state specificate due modalità: %s e --%s"
+
+#~ msgid "manflag"
+#~ msgstr "manflag"
+
 #~ msgid "%s: failed to exec gzip -dc"
 #~ msgstr "%s: impossibile eseguire gzip -dc"
 
diff --git a/po/ja.po b/po/ja.po
index 92ed9d99..3235f7bf 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13 r503\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+0300\n"
 "PO-Revision-Date: 2006-09-13 22:11+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Debian Japanease List <debian-japanese@lists.debian.org>\n"
@@ -4450,7 +4450,7 @@ msgid "unable to close %s after read: %s"
 msgstr "%s の読み取り後のクローズに失敗しました: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "%s をクローズできません: %s"
@@ -4541,9 +4541,10 @@ msgstr ""
 "パッケージの preinst/postrm スクリプトは --package と --divert を常に指定すべ"
 "きです。\n"
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
-#, perl-format
-msgid "two modes specified: %s and --%s"
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
+#, fuzzy, perl-format
+msgid "two commands specified: %s and --%s"
 msgstr "2 つのモードが指定されました: %s と --%s"
 
 #: scripts/dpkg-divert.pl:111
@@ -4565,13 +4566,13 @@ msgid "package may not contain newlines"
 msgstr "パッケージは改行を含んではなりません"
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s は引数として <ディレクトリ> が必要です"
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "不明なオプション `%s'"
@@ -4724,7 +4725,7 @@ msgstr "新しい diversions-old を作成: %s"
 msgid "install new diversions: %s"
 msgstr "新しい退避をインストール: %s"
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "内部エラー: %s は壊れています: %s"
@@ -5184,8 +5185,8 @@ msgstr ""
 "  --version                   バージョン番号を表示\n"
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
-msgstr "manフラグ"
+msgid "invalid update mode"
+msgstr ""
 
 #: scripts/update-alternatives.pl:135
 #, perl-format
@@ -5221,92 +5222,92 @@ msgstr ""
 "%s の alternative が %s を指していますが、発見できませんでした。alternatives "
 "のリストから削除しています。"
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s -状態は %s。"
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr " リンクは現在 %s を指しています"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr "リンクは現在ありません"
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr "リンクを読み取れません - %s"
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - 優先度 %s"
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr " スレーブ %s: %s"
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 msgid "No versions available."
 msgstr "利用可能なバージョンはありません。"
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "現在の `最適' バージョンは %s です。"
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "`%s' は不明な引数です"
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install は<リンク> <名前> <パス> <優先度> が必要です"
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr "優先度は整数でなければなりません"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s は <名前> <パス> が必要です"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s は <名前> が必要です"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave は<リンク> <名前> <パス> が必要です"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "スレーブ名 %s が重複しています"
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "スレーブリンク %s が重複しています"
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "名前 %s がプライマリ/スレーブの両方にあります"
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "リンク %s がプライマリ/スレーブの両方にあります"
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5314,31 +5315,31 @@ msgstr ""
 "--display、--config、--set、--install、--remove、--all、--remove-all、--auto "
 "のいずれかが必要です。"
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr "--slave は --install と一緒のみ許可されています"
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "%s の alternatives がありません。"
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "%s の自動選択を設定しています。"
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "%s を削除できません: %s"
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5347,7 +5348,7 @@ msgstr ""
 "%s が (手動あるいはスクリプトにより) 変更されました。\n"
 "手動更新のみに切り替えています。"
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5357,70 +5358,70 @@ msgstr ""
 "(望むなら、これらのシンボリックリンクをあなた自身で変更することもできます。"
 "`man ln' を参照してください。)"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "%s のリンクを %s から %s に名前変更しています。"
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "%s から %s に名前変更できません: %s"
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "スレーブリンク名 %s が重複しています"
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "%s のスレーブリンクを %s から %s に名前変更しています。"
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 "手動で選択された alternative を削除しています - 自動モードに切り替えています"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "%2$s の alternative %1$s は登録されていません。削除は行いません。"
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "古いスレーブリンク %s を破棄しています (%s)。"
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "%s の自動更新は無効になっています。そのままにしておきます。"
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr "自動更新に戻るには、`update-alternatives --auto %s' を使ってください。"
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "以前に失敗した %s の更新を修復しています ..."
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "%s を書き込み用にオープンできません: %s"
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr ""
 "%s (%s) を提供する最後のパッケージが削除されました。alternative を削除してい"
 "ます。"
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5429,38 +5430,38 @@ msgstr ""
 "警告: %s は %s へのシンボリックリンク (あるいは存在しない) であると想定\n"
 "されています; しかし、readlink が失敗しました: %s"
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "%s が存在しないことを確定できません: %s"
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "%s から %s へのシンボリックリンクを作成できません: %s"
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "%s を %s としてインストールできません: %s"
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "%3$s を指している %1$s (%2$s) をそのままにします。"
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "%3$s を指している %1$s (%2$s) を更新しています。"
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5469,13 +5470,13 @@ msgstr ""
 "警告: %s は %s へのスレーブシンボリックリンク (あるいは存在しない) であると想"
 "定されています; しかし、readlink が失敗しました: %s"
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "%3$s に適当でない %1$s を削除しています (%2$s)。"
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5484,7 +5485,7 @@ msgstr ""
 "%s を提供するプログラムが 1 つしかありません (%s)。\n"
 "設定は行いません。\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5493,7 +5494,7 @@ msgstr ""
 "%s を提供するプログラムが 1 つしかありません (%s)。\n"
 "設定は行いません。\n"
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5506,48 +5507,54 @@ msgstr ""
 "  選択肢       alternative\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 "デフォルト[*] のままにするには Enter、さもなければ選択肢の番号のキーを押して"
 "ください: "
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "`%2$s' を提供するために `%1$s' を使います。"
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "alternative `%s' が見つかりません。"
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "標準出力への書き込み中にエラーが発生しました: %s"
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "update-alternatives ファイル内での改行は禁止されています (%s)"
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr ""
 "%2$s の %1$s の読み取り中にエラーが発生したか eof を読み取りました (%3$s)"
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, perl-format
 msgid "missing newline after %s"
 msgstr "%s の後の改行がありません"
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "深刻な問題: %s"
 
+#~ msgid "two modes specified: %s and --%s"
+#~ msgstr "2 つのモードが指定されました: %s と --%s"
+
+#~ msgid "manflag"
+#~ msgstr "manフラグ"
+
 #~ msgid "%s: failed to exec gzip -dc"
 #~ msgstr "%s: gzip -dc の実行に失敗しました"
 
diff --git a/po/km.po b/po/km.po
index f057e1c9..737d7f1b 100644
--- a/po/km.po
+++ b/po/km.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg_po_km\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+0300\n"
 "PO-Revision-Date: 2006-10-04 09:49+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team:  <en@li.org>\n"
@@ -4303,7 +4303,7 @@ msgid "unable to close %s after read: %s"
 msgstr "មិន​អាច​បិទ %s បន្ទាប់​ពី​អាន ៖ %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "មិន​អាច​បិទ %s ៖ %s"
@@ -4391,9 +4391,10 @@ msgstr ""
 "នៅ​ពេល​យកចេញ --package ឬ --local និង --divert ត្រូវតែ​ផ្គូផ្គង ប្រសិន​បើ​បាន​បញ្ជាក់ ។\n"
 "ស្គ្រីប​កញ្ចប់ preinst/postrm គួរតែ​បញ្ជា​ជា​និច្ច --package និង --divert ។\n"
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
-#, perl-format
-msgid "two modes specified: %s and --%s"
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
+#, fuzzy, perl-format
+msgid "two commands specified: %s and --%s"
 msgstr "មាន​ពីរ​របៀប​បាន​បញ្ជាក់ ៖ %s និង --%s"
 
 #: scripts/dpkg-divert.pl:111
@@ -4415,13 +4416,13 @@ msgid "package may not contain newlines"
 msgstr "កញ្ចប់​មិនអាច​មាន​បន្ទាត់​ថ្មី"
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s ត្រូវការ​អាគុយម៉ង់ <ថត>"
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "មិន​​ស្គា​ល់​ជម្រើស​ `%s'"
@@ -4574,7 +4575,7 @@ msgstr "បង្កើត​ការ​បង្វែរ​ចាស់ ៖
 msgid "install new diversions: %s"
 msgstr "ដំឡើង​ការ​បង្វែរ​ថ្មី ៖ %s"
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "កំហុស​ខាង​ក្នុង ៖ %s ខូច ៖ %s"
@@ -5018,8 +5019,8 @@ msgstr ""
 "  --version                បង្ហាញ​កំណែ ។\n"
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
-msgstr "manflag"
+msgid "invalid update mode"
+msgstr ""
 
 #: scripts/update-alternatives.pl:135
 #, perl-format
@@ -5053,92 +5054,92 @@ msgid ""
 "alternatives."
 msgstr "ជម្រើសសម្រាប់ %s ចង្អុលទៅ %s - ដែលរកមិនឃើញ ។  យក​ចេញ​ពី​បញ្ជី​របស់​ជម្រើស ។"
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - ស្ថានភាព​គឺ​ជា %s ។"
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr " តំណ​បច្ចុប្បន្ន​ចង្អុល​ទៅ %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr " គ្មាន​​តំណ​បច្ចុប្បន្ន"
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " តំណ​ដែល​មិន​អាច​អាន​បាន - %s"
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - អាទិភាព %s"
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr " កូនចៅ %s ៖ %s"
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 msgid "No versions available."
 msgstr "គ្មានកំណែ ។"
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "កំណែ `ល្អ​បំផុត' បច្ចុប្បន្ន​គឺ %s ។"
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "មិន​ស្គាល់​អាគុយម៉ង់​ `%s'"
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install ត្រូវការ <តំណ> <ឈ្មោះ> <ផ្លូវ> <អាទិភាព>"
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr "អាទិភាព​ត្រូវតែ​ជា​ចំនួន​គត់"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s ត្រូវការ <ឈ្មោះ> <ផ្លូវ>"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s ត្រូវការ <ឈ្មោះ>"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave ត្រូវការ <តំណ> <ឈ្មោះ> <ផ្លូវ>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "ឈ្មោះ​កូនចៅ %s បាន​ស្ទួន​"
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "តំណ​កូនចៅ​ %s បាន​ស្ទួន​"
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "ឈ្មោះ %s គឺ​ទាំង​មេ និង​កូនចៅ"
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "តំណ %s គឺ​ទាំង​មេ និង​កូនចៅ"
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5146,31 +5147,31 @@ msgstr ""
 "ត្រូវការ --display, --config, --set, --install, --remove, --all, --remove-all "
 "ឬ --auto"
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr "--slave បាន​អនុញ្ញាត​តែ​ជា​មួយ --install ប៉ុណ្ណោះ"
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "គ្មាន​ជម្រើ​សម្រាប់ %s ។"
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "រៀបចំ​ជម្រើស​ស្វ័យប្រវត្តិ​របស់ %s ។"
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "មិន​អាច​យក %s ៖ %s ចេញ"
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5179,7 +5180,7 @@ msgstr ""
 "%s ត្រូវ​បាន​ផ្លាស់ប្ដូរ (ដោយ​ដៃ ឬ​ដោយ​ស្គ្រីប) ។\n"
 "ប្ដូរទៅ​ជា​ការ​ធ្វើ​ឲ្យ​ទាន់​សម័យ​ដោយ​ដៃ​តែ​ប៉ុណ្ណោះ ។"
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5188,67 +5189,67 @@ msgstr ""
 "កំពុងពិនិត្យមើលកំណែដែលមានរបស់ %s ធ្វើឲ្យតំណទាន់សម័យក្នុង %s ...\n"
 "(អ្នកអាចកែប្រែតំណនិមិត្តសញ្ញានៅទីនោះ ប្រសិនបើអ្នកចង់បាន - មើល `man ln' ។)"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "ប្ដូរ​ឈ្មោះ​តំណ %s ពី %s ទៅជា %s ។"
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "មិន​អាច​ប្ដូរ​ឈ្មោះ %s ទៅ​ជា %s ៖ %s"
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "ឈ្មោះ​តំណ​កូន​ចៅ​ %s បាន​ស្ទួន​"
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "ប្ដូរ​ឈ្មោះ​តំណ​កូនចៅ %s ពី %s ទៅជា %s ។"
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "យក​ជម្រើស​ដែល​បាន​ជ្រើស​ចេញ​ដោយ​ដៃ - ប្ដូរ​ទៅ​ជា​របៀប​ស្វ័យប្រវត្តិ"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "ជម្រើស %s សម្រាប់ %s មិន​បាន​ចុះ​ឈ្មោះ មិន​យក​ចេញ​ទេ"
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "បោះបង់​តំណ​កូន​ចៅ​ដែល​លែង​ប្រើ %s (%s) ។"
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "ការ​ធ្វើឲ្យ​ទាន់​សម័យ​ដោយ​ស្វ័យប្រវត្តិ​របស់ %s ត្រូវ​បាន​មិន​អនុញ្ញាត ទុក​វា​ឲ្យ​នៅ​តែឯង ។"
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr "ដើម្បី​ត្រឡ​ប់ទៅ​ការ​ធ្វើ​ឲ្យ​ទាន់​សម័យ​ដោយ​ស្វ័យប្រវត្តិ ប្រើ `ជម្រើស​ធ្វើ​ឲ្យទាន់​សម័យ --auto %s'."
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "កំពុង​សង្គ្រោះ​ការ​ធ្វើ​ឲ្យ​ទាន់​សម័យ​ដែល​បាន​បរាជ័យ​ពី​មុន​របស់ %s ឡើង​វិញ..."
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "មិន​អាច​បើក %s ដើម្បី​សរសេរ ៖ %s"
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "ការ​ផ្ដល់​កញ្ចប់​ចុង​ក្រោយ %s (%s) បាន​យក​ចេញ លុប​វា ។"
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5257,38 +5258,38 @@ msgstr ""
 "ព្រមាន ៖ %s ត្រូវ​បាន​សន្មត់​ថា​ជា​តំណ​និមិត្ត​សញ្ញា​ទៅ %s\n"
 " (ឬ​មិ​នទាន់​មាន) ទោះ​ជា​យ៉ាង​ណា​ក៏​ដោយ ការ​អាន​តំណ​បាន​បរាជ័យ ៖ %s"
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "មិន​អាច​ប្រាកដ​ថា %s មិន​ទាន់​មាន ៖ %s"
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "មិន​អាច​បង្កើត​តំណ​និមិត្ត​សញ្ញា %s ទៅ %s ៖ %s"
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "មិន​អាច​ដំឡើង %s ជា %s ៖ %s"
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "ទុកឲ្យ %s (%s) ចង្អុលទៅ %s ។"
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "ធ្វើ​ឲ្យ %s (%s) ទាន់​សម័យ ដើម្បី​ចង្អុល​ទៅ %s ។"
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5297,13 +5298,13 @@ msgstr ""
 "ព្រមាន ៖ %s ត្រូវ​បាន​សន្មត់​ថា​ជា​តំណ​និមិត្ត​សញ្ញា​កូនចៅ​ទៅ\n"
 " %s ឬ​មិន​ទាន់​មាន ទោះ​ជា​យ៉ាងណាក៏ដោយ ការ​អាន​តំណ​បាន​បរាជ័យ ៖ %s"
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "យក %s (%s) ចេញ មិន​សម​នឹង %s ។"
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5312,7 +5313,7 @@ msgstr ""
 "មាន​តែ​កម្មវិធី​តែ ១ ប៉ុណ្ណោះ​ដែល​ផ្ដល់ %s\n"
 "(%s) ។ គ្មាន​អ្វី​ត្រូវ​កំណត់​រចនាសម្ព័ន្ធ ។\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5321,7 +5322,7 @@ msgstr ""
 "មាន​តែ​កម្មវិធី​តែ ១ ប៉ុណ្ណោះ​ដែល​ផ្ដល់ %s\n"
 "(%s) ។ គ្មាន​អ្វី​ត្រូវ​កំណត់​រចនាសម្ព័ន្ធ ។\n"
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5334,45 +5335,51 @@ msgstr ""
 "  ជម្រើស    ជំនួស\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr "សង្កត់​គ្រាប់ចុច បញ្ចូល ដើម្បី​រក្សា​លំនាំដើម[*] ឬ​វាយ​លេខ​ជម្រើស ៖ "
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "ការ​ប្រើ `%s' ដើម្បី​ផ្ដល់ `%s' ។"
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "មិន​អាច​រក​ជម្រើស `%s' ។"
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "កំហុស​ក្នុង​ការ​សរសេរ stdout ៖ %s"
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "បន្ទាត់​ថ្មី​បាន​ហាមឃាត់​ក្នុង​ឯកសារ​ជម្រើស​ធ្វើឲ្យ​ទាន់​សម័យ (%s)"
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "ការ​អាន​កំហុស ឬ ចុង​ឯកសារ %s សម្រាប់ %s (%s)"
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, perl-format
 msgid "missing newline after %s"
 msgstr "បាត់​បន្ទាត់​ថ្មី​បន្ទាប់​ពី %s"
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "បញ្ហាធ្ងន់ធ្ងរ ៖ %s"
 
+#~ msgid "two modes specified: %s and --%s"
+#~ msgstr "មាន​ពីរ​របៀប​បាន​បញ្ជាក់ ៖ %s និង --%s"
+
+#~ msgid "manflag"
+#~ msgstr "manflag"
+
 #~ msgid "%s: failed to exec gzip -dc"
 #~ msgstr "%s ៖ បាន​បរាជ័យ​ក្នុង​ការ​ប្រតិបត្តិ gzip -dc"
 
diff --git a/po/ko.po b/po/ko.po
index f020f10d..38104a5a 100644
--- a/po/ko.po
+++ b/po/ko.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: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+0300\n"
 "PO-Revision-Date: 2006-12-31 21:12+0200\n"
 "Last-Translator: Sunjae Park <darehanl@gmail.com>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -4403,7 +4403,7 @@ msgid "unable to close %s after read: %s"
 msgstr "%s 읽은 후에 닫는 데 실패했습니다: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "%s 닫을 수 없습니다: %s"
@@ -4491,9 +4491,10 @@ msgstr ""
 "있어야 합니다. 꾸러미의 preinst, postrm 스크립트는 언제나 --package와 --"
 "divert을 지정하는 것이 좋습니다.\n"
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
-#, perl-format
-msgid "two modes specified: %s and --%s"
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
+#, fuzzy, perl-format
+msgid "two commands specified: %s and --%s"
 msgstr "두 가지 모드가 지정되었습니다: %s와 --%s"
 
 #: scripts/dpkg-divert.pl:111
@@ -4515,13 +4516,13 @@ msgid "package may not contain newlines"
 msgstr "꾸러미에 새줄문자가 있어서는 안 됩니다"
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s 옵션은 <directory> 인수가 필요합니다"
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "알 수 없는 옵션 '%s'"
@@ -4674,7 +4675,7 @@ msgstr "새로운 diversions-old 생성합니다: %s"
 msgid "install new diversions: %s"
 msgstr "새로운 우회경로(diversions) 설치합니다: %s"
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "내부 오류: '%s' 망가졌습니다: %s"
@@ -5126,8 +5127,8 @@ msgstr ""
 "  --version                버전을 보여줍니다.\n"
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
-msgstr "manflag"
+msgid "invalid update mode"
+msgstr ""
 
 #: scripts/update-alternatives.pl:135
 #, perl-format
@@ -5163,92 +5164,92 @@ msgstr ""
 "%s의 대체 항목은 %s을(를) 가리키지만 찾지 못했습니다. 대체 항목의 목록에서 지"
 "웁니다."
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - 상태는 %s입니다."
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr " 연결 현재 %s을(를) 가리키는 중"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr " 연결 현재 없음"
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " 연결 읽을 수 없습니다 - %s"
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - 우선순위 %s"
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr " 슬레이브 %s: %s"
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 msgid "No versions available."
 msgstr "버전 없음."
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "현재 가장 '좋은' 버전은 %s입니다."
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "알 수 없는 인수 '%s'"
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install은 <link> <name> <path> <priority>를 필요로 합니다"
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr "priority는 정수여야 합니다"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s 옵션은 <name> <path>을(를) 필요로 합니다"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s 옵션은 <name>을(를) 필요로 합니다"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave는 <link> <name> <path>를 필요로 합니다"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "슬레이브의 이름 %s이(가) 중복되었습니다"
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "슬레이브 연결 %s 중복되었습니다"
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "이름 %s은(는) 프라이머리와 슬레이브 둘 다입니다"
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "연결 %s은(는) 프라이머리와 슬레이브 둘 다입니다"
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5256,31 +5257,31 @@ msgstr ""
 "--display이나 --config, --set, --install, --remove, --all, --remove-all, --"
 "auto를 필요로 합니다."
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr "--slave는 --install와 함께 사용해야 합니다"
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "%s의 대체 항목이 없습니다."
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "%s의 자동 선택을 설정하는 중입니다."
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "%s을(를) 지울 수 없습니다: %s"
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5289,7 +5290,7 @@ msgstr ""
 "%s 변경되었습니다(수동으로 직접, 혹은 스크립트로).\n"
 "수동 업데이트만 사용하기로 변경합니다."
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5298,70 +5299,70 @@ msgstr ""
 "%s의 사용할 수 있는 버전들을 확인하고 %s에 있는 연결들을 업데이트하는 중...\n"
 "(원한다면 거기에 있는 symlink들을 직접 조작할 수 있습니다 - 'man ln' 참조)."
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "%s 연결을 %s에서 %s으(로) 이름을 바꿉니다."
 
 # FIXME: bad msgid
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "%s을(를) %s(으)로 이름을 바꿀 수 없습니다: %s"
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "슬레이브 연결의 이름 %s 중복되었습니다"
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "슬레이브 연결 %s의 이름을 %s에서 %s(으)로 변경하는 중입니다."
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "수동으로 선택한 대체 항목을 지우는 중 - 자동 모드로 변경합니다"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "%2$s의 대체 항목 %1$s 등록되지 않았으므로 지우지 않습니다."
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "사용 중지된 슬레이브 연결 %s 없애는 중(%s)."
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "%s의 자동 업데이트가 중지되었으므로 가만히 둡니다."
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 "다시 자동업데이트를 사용하려면 'update-alternatives --auto %s'을(를) 사용하십"
 "시오."
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "전에 실패했던 %s의 업데이트에서 복구하는 중..."
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "'%s' 쓰기 위해 열 수 없습니다: %s"
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "%s을(를) 제공하던 마지막 꾸러미(%s)가 제거되었으므로 지웁니다."
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5370,38 +5371,38 @@ msgstr ""
 "경고: %s은(는) %s로의 symlink이어야 하거나 \n"
 "없어야 하지만 readlink가 실패했습니다. %s"
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "%s이(가) 없다는 것을 확인할 수 없습니다. %s"
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "%s을(를) %s에 대한 심볼릭 링크로 만들 수 없습니다: %s"
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "%s 파일을 %s 파일로 설치할 수 없습니다: %s"
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "%s(%s)이(가) %s을(를) 계속 가리키도록 둡니다."
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "%s(%s)이(가) %s을(를) 가리키도록 바꿉니다."
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5410,13 +5411,13 @@ msgstr ""
 "경고: %s은(는) %s(으)로의 슬레이브 symlink이거나 존재하지\n"
 "않아야하지만 readlink가 실패했습니다. %s"
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "%3$s에 적절하지 않으므로 %1$s(%2$s) 지우는 중."
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5425,7 +5426,7 @@ msgstr ""
 "%s(%s)을(를) 제공하는 프로그램이 하나만 있습니다.\n"
 "설정할 것이 없습니다.\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5434,7 +5435,7 @@ msgstr ""
 "%s(%s)을(를) 제공하는 프로그램이 하나만 있습니다.\n"
 "설정할 것이 없습니다.\n"
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5447,46 +5448,52 @@ msgstr ""
 "  선택번호     대체항목\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 "기본 사항[*]을 사용하려면 엔터, 다른 것을 사용하려면 번호를 입력하십시오: "
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "'%s'이(가) %s을(를) 제공하도록 하는 중."
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "대체항목 '%s' 찾을 수 없습니다."
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "stdout에 쓰는 데 오류가 발생했습니다: %s"
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "update-alternatives 파일(%s)에는 줄바꿈이 금지되어 있습니다."
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "%2$s에서 %1$s 읽는데 오류가 발생했거나 eof가 있었습니다(%3$s)."
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, perl-format
 msgid "missing newline after %s"
 msgstr "%s 다음에 줄바꿈이 없습니다"
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "심각한 문제: %s"
 
+#~ msgid "two modes specified: %s and --%s"
+#~ msgstr "두 가지 모드가 지정되었습니다: %s와 --%s"
+
+#~ msgid "manflag"
+#~ msgstr "manflag"
+
 #~ msgid "%s: failed to exec gzip -dc"
 #~ msgstr "%s: gzip -dc 실행 실패"
 
diff --git a/po/ku.po b/po/ku.po
index dd377537..1dfff3fb 100644
--- a/po/ku.po
+++ b/po/ku.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: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+0300\n"
 "PO-Revision-Date: 2007-04-07 13:50+0100\n"
 "Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n"
 "Language-Team: Kurdish <ku@li.org>\n"
@@ -3988,7 +3988,7 @@ msgid "unable to close %s after read: %s"
 msgstr ""
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr ""
@@ -4050,9 +4050,10 @@ msgid ""
 "divert.\n"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
 #, perl-format
-msgid "two modes specified: %s and --%s"
+msgid "two commands specified: %s and --%s"
 msgstr ""
 
 #: scripts/dpkg-divert.pl:111
@@ -4074,13 +4075,13 @@ msgid "package may not contain newlines"
 msgstr ""
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr ""
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, perl-format
 msgid "unknown option `%s'"
 msgstr ""
@@ -4225,7 +4226,7 @@ msgstr ""
 msgid "install new diversions: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr ""
@@ -4595,7 +4596,7 @@ msgid ""
 msgstr ""
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
+msgid "invalid update mode"
 msgstr ""
 
 #: scripts/update-alternatives.pl:135
@@ -4630,261 +4631,261 @@ msgid ""
 "alternatives."
 msgstr ""
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr ""
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 msgid "No versions available."
 msgstr ""
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr ""
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr ""
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, perl-format
 msgid "--%s needs <name>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
 msgstr ""
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr ""
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
 "Switching to manual updates only."
 msgstr ""
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
 "(You may modify the symlinks there yourself if desired - see `man ln'.)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr ""
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr ""
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr ""
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr ""
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
 " (or nonexistent); however, readlink failed: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
 " %s, or nonexistent; however, readlink failed: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
 "Nothing to configure.\n"
 msgstr "  Pakêta %s ya ku %s tîne hê nehatiye veavakirin.\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
 "(%s). Nothing to configure.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -4893,41 +4894,41 @@ msgid ""
 "-----------------------------------------------\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, perl-format
 msgid "missing newline after %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Pirsgirêka cidî: %s"
diff --git a/po/mr.po b/po/mr.po
index e715ca1c..d4fa45b3 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+0300\n"
 "PO-Revision-Date: 2006-08-17 16:02+0200\n"
 "Last-Translator: Priti Patil <prithisd@gmail.com>\n"
 "Language-Team:  Marathi, janabhaaratii, C-DAC, Mumbai, India "
@@ -4326,7 +4326,7 @@ msgid "unable to close %s after read: %s"
 msgstr ": %s वाचल्यानंतर %s बंद करता येत नाही"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "%s: %s बंद करता येत नाही"
@@ -4414,9 +4414,10 @@ msgstr ""
 "पाहिजेत.\n"
 "पॅकेज स्थापनपूर्व/काढल्यानंतर परिभाषेत --पॅकेज व --वळवा निर्धारीत केलेल्या असल्याच पाहिजेत\n"
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
-#, perl-format
-msgid "two modes specified: %s and --%s"
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
+#, fuzzy, perl-format
+msgid "two commands specified: %s and --%s"
 msgstr "दोन पद्धती निर्धारीत केल्यात: %s आणी --%s"
 
 #: scripts/dpkg-divert.pl:111
@@ -4438,13 +4439,13 @@ msgid "package may not contain newlines"
 msgstr "पॅकेज मधे न्युलाइनस् नसेल"
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s साठी  <निर्देशिका> पर्यायाची गरज आहे"
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "अपरिचीत पर्याय `%s'"
@@ -4595,7 +4596,7 @@ msgstr "नवीन वळण-जुने: %s बनवा"
 msgid "install new diversions: %s"
 msgstr "नवीन वळणे: %s अधिष्ठापन करा"
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "अंतर्गत त्रुटी: %s भ्रष्ट: %s"
@@ -5049,8 +5050,8 @@ msgstr ""
 "  --आवृत्ती                आवृत्तीची माहिती दाखवा.\n"
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
-msgstr "मॅनफ्लॅग"
+msgid "invalid update mode"
+msgstr ""
 
 #: scripts/update-alternatives.pl:135
 #, perl-format
@@ -5086,92 +5087,92 @@ msgstr ""
 "%s साठीचा विकल्प %s कडे निर्देश करतो - जो सापडला नाही. विकल्पांच्या यादीतून काढून "
 "टाकत आहे."
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - सद्यस्थिती %s आहे."
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr "साखळी सद्ध्या %s कडे निर्देश करते"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr "साखळी सद्ध्या अस्तित्वात नाही"
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr "साखळी अवाचनीय - %s"
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - अग्रक्रम %s"
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr " गुलाम %s: %s"
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 msgid "No versions available."
 msgstr "आवृत्त्या उपलब्ध नाहीत."
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "सद्ध्याची `सर्वात चांगली' आवृत्ती %s आहे."
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "अपरिचीत पर्याय `%s'"
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--अधिष्ठापा साठी <साखळी> <नाव> <मार्ग> <अग्रक्रम> आवश्यक"
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr "अग्रक्रम हा पूर्णांकच असला पाहिजे"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s साठी <नाव> <मार्ग> आवश्यक"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s साठी <नाव> आवश्यक"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr "--गुलाम साठी <साखळी> <नाव> <मार्ग> आवश्यक"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "गुलाम नाव %s ची पुनरावृत्ती"
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "गुलाम साखळी %s ची पुनरावृत्ती"
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "नाव %s हे प्राथमिक व गुलाम दोन्ही"
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "साखळी %s ही प्राथमिक व गुलाम दोन्ही"
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5179,31 +5180,31 @@ msgstr ""
 "--दाखवा, --संरचना, --निश्चिती, --अधिष्ठापा, --काढा, --सर्व, --काढा-सर्व, किंवा --"
 "स्वयं गरजेचे"
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr "--गुलाम ला फक्त --अधिष्ठापा सोबत अनुमती"
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "%s साठी विकल्प नाही."
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "%s करिता स्वयंचलित निवड संरचित करत आहे."
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr " %s काढून टाकता येत नाही: %s"
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5212,7 +5213,7 @@ msgstr ""
 "%s मधे बदल झाला आहे (तुमच्याकडून किंवा  परिभाषेकडून).\n"
 "फक्त स्वहस्तेच सुधारणा करण्याचे स्विकारत आहे."
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5221,67 +5222,67 @@ msgstr ""
 "%s च्या उपलब्ध आवृत्त्या तपासत आहे, %s ... तील साखळ्यात सुधारणा करत आहे\n"
 "(इच्छा असल्यास तेथील सिमलिंकस् आपण स्वतः बदलू शकता - पहा `मॅन इन'.)"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "%s साखळीचे %s मधून %s मधे पुनर्नामांकन करत आहे."
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "%s चे %s मधे पुनर्नामांकन करता येत नाही: %s"
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "गुलाम साखळी %s च्या नावाची पुनरावृत्ती"
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "गुलाम साखळी %s चे %s मधून %s मधे पुनर्नामांकन करत आहे."
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "तुम्ही स्वतःच निवडलेले विकल्प काढून टाकत आहे - स्वयंचलित पद्धती स्विकारत आहे"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "%s साठीचा %s विकल्प नोंदणीकृत नाही, काढून टाकत नाही."
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "कालबाह्य गुलाम साखळी %s (%s) त्यागत आहे."
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "%s च्या स्वयंचलित सुधारणा असमर्थ केलेल्या आहेत, तसेच सोडत आहे."
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr "स्वयंचलित सुधारणांकडे परत जाण्यासाठी `सुधारा-विकल्प --स्वयं %s' वापरा."
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "%s ... च्या पूर्वीच्या फसलेल्या सुधारणांतून पूर्वस्थितीवर येत आहे"
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "लेखनाकरिता %s उघडता येत नाही: %s"
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "%s (%s) पुरवणारे शेवटचे पॅकेज काढले, ते काढून टाकत आहे."
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5290,38 +5291,38 @@ msgstr ""
 "धोक्याची सूचना: %s ही %s ची सिमलिंक असणे अपेक्षित\n"
 " (किंवा अस्तित्वात नाही); परंतु, साखळीवाचन फसले: %s"
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "%s अस्तित्वात नसल्याची खात्री करता येत नाही: %s "
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "%s ला %s ची सिमलिंक करता येत नाही: %s"
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "%s हे %s म्हणून अधिष्टापन करता येत नाही: %s"
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "%s (%s) ला %s कडे निर्देश केलेल्या स्थितीत सोडत आहे."
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "%s (%s) ला %s कडे निर्देश करण्यासाठी सुधारीत करत आहे."
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5330,13 +5331,13 @@ msgstr ""
 "धोक्याची सूचना: %s ही %s ची गुलाम सिमलिंक असणे अपेक्षित\n"
 " (किंवा अस्तित्वात नाही); परंतु, साखळीवाचन फसले: %s"
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "%s (%s) काढून टाकत आहे, %s शी सुसंगत नाही."
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5345,7 +5346,7 @@ msgstr ""
 "%s पुरवणारी फक्त १ आज्ञावली आहे\n"
 "(%s). संरचना करण्यास काहीही नाही.\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5354,7 +5355,7 @@ msgstr ""
 "%s पुरवणारी फक्त १ आज्ञावली आहे\n"
 "(%s). संरचना करण्यास काहीही नाही.\n"
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5367,45 +5368,51 @@ msgstr ""
 "  निवड    विकल्प\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr "डिफॉल्ट[*] ठेवण्यासाठी एंटर दाबा, किंवा निवड अंक टाइप करा: "
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "`%s' पुरवण्याकरिता `%s' वापरत आहे."
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "विकल्प `%s' सापडत नाही."
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, fuzzy, perl-format
 msgid "error writing stdout: %s"
 msgstr "एसटीडीआउट लिहीताना त्रुटी"
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "सुधार-विकल्प फायलींमधे न्यूलाइन्स ना मनाई (%s)"
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "%s करिता %s चे वाचन करताना त्रुटी किंवा इओएफ (%s)"
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, perl-format
 msgid "missing newline after %s"
 msgstr "%s नंतर न्यूलाइन गायब"
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "गंभीर समस्या: %s"
 
+#~ msgid "two modes specified: %s and --%s"
+#~ msgstr "दोन पद्धती निर्धारीत केल्यात: %s आणी --%s"
+
+#~ msgid "manflag"
+#~ msgstr "मॅनफ्लॅग"
+
 #~ msgid "%s: failed to exec gzip -dc"
 #~ msgstr "%s: जीझिप -डीसी ची अंमलबजावणी होउ शकली नाही"
 
diff --git a/po/nb.po b/po/nb.po
index 0a860bab..cc8e9b29 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: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+0300\n"
 "PO-Revision-Date: 2006-10-15 23:32+0100\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.ui.no>\n"
@@ -4390,7 +4390,7 @@ msgid "unable to close %s after read: %s"
 msgstr "klarte ikke lukke %s etter lesing: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "klarte ikke lukke %s: %s"
@@ -4479,9 +4479,10 @@ msgstr ""
 "Når man fjerner må --package eller --local og --divert stemme hvis oppgitt.\n"
 "Pakke preinst/postrm skript skal alltid oppgi --package og --divert.\n"
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
-#, perl-format
-msgid "two modes specified: %s and --%s"
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
+#, fuzzy, perl-format
+msgid "two commands specified: %s and --%s"
 msgstr "to modi oppgitt: %s og --%s"
 
 #: scripts/dpkg-divert.pl:111
@@ -4503,13 +4504,13 @@ msgid "package may not contain newlines"
 msgstr "pakke kan ikke  inneholde linjeskift"
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s krever et <katalog> argument"
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "ukjent opsjon «%s»"
@@ -4662,7 +4663,7 @@ msgstr "opprett ny omdirigeringer-gammel: %s"
 msgid "install new diversions: %s"
 msgstr "installer nye omdirigeringer: %s"
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "intern feil: %s korrupt: %s"
@@ -5117,8 +5118,8 @@ msgstr ""
 "  --version                vis versjonen.\n"
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
-msgstr "man-flagg"
+msgid "invalid update mode"
+msgstr ""
 
 #: scripts/update-alternatives.pl:135
 #, perl-format
@@ -5154,92 +5155,92 @@ msgstr ""
 "Alernativ for %s peker til %s - som ikke ble funnet. Fjernes fra listen over "
 "alternativ."
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - status er %s."
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr " lenke peker for øyeblikket til %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr " lenke er borte for øyeblikket "
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr "lenke uleselig - %s"
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - prioritet %s"
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr " slave %s: %s"
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 msgid "No versions available."
 msgstr "Ingen versjoner tilgjengelig."
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "Nåværende  «beste» versjon er %s."
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "ukjent argument «%s»"
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install trenger <lenke> <navn> <sti> <prioritet>"
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr "prioritet må være et heltall"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s krever <navn> <sti>"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s krever <navn>"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave trenger <lenke> <navn> <sti>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "slave-navn %s duplisert"
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "slave-lenke %s duplisert"
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "navn %s er både primær og slave"
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "lenke %s er både primær og slave"
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5247,31 +5248,31 @@ msgstr ""
 "trenger --display, --config, --set, --install, --remove, --all, --remove-all "
 "eller --auto"
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr "--slave bare tillatt med --install"
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Ingen alternativ for %s."
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Setter opp automatisk valg av %s."
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "klarte ikke fjerne %s: %s"
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5280,7 +5281,7 @@ msgstr ""
 "%s har blitt endret (manuelt eller av et skript).\n"
 "Bytter over til kun manuelle oppdateringer."
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5289,69 +5290,69 @@ msgstr ""
 "Sjekker tilgjengelige versjoner av %s, oppdaterer lenker i %s ...\n"
 "(Du kan endre de symbolske lenkene der selv hvis du ønsker - se «man ln».)"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Endrer navn på %s lenke fra %s til %s."
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "klarte ikke endre navn på %s til %s: %s"
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "slave-lenkenavn %s er duplisert"
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "Endre navn på %s slave-lenke fra %s til %s."
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "Fjerner manuelt valgte alternativ - bytter til automatisk modus"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "Alternativ %s for %s er ikke registrert, fjernes ikke."
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Kasserer foreldet slavelenke %s (%s)."
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "Automatiske oppdateringer av %s er slått av, lar den være i fred."
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 "For å gå tilbake til automatiske oppdateringer bruk «update-alternatives --"
 "auto %s»."
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Gjenoppretter fra tidligere feilet oppdatering av %s ..."
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "klarte ikke åpne %s for skriving: %s"
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "Siste pakke som tilbyr %s (%s) fjernet, sletter den."
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5360,38 +5361,38 @@ msgstr ""
 "advarsel: %s skal være en symbolsk lenke til %s\n"
 "(eller ikke-eksisterende); likevel feilet lesing av lenke: %s"
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "klarte ikke forsikre at %s ikke eksisterer: %s"
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "klarte ikke gjøre %s til en symbolsk lenke til %s: %s"
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "klarte ikke installere %s som %s: %s"
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "Forlater %s (%s) pekende til %s."
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "Oppdaterer %s (%s) til å peke til %s."
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5400,13 +5401,13 @@ msgstr ""
 "advarsel: %s skal være en slave symbolsk lenke til\n"
 "%s eller ikke-eksisterende; likevel feilet lesing av lenke: %s"
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "Fjerner %s (%s), siden det ikke passer med %s."
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5415,7 +5416,7 @@ msgstr ""
 "Det er bare et program som tilbyr %s\n"
 "(%s). Det er ingenting å konfigurere.\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5424,7 +5425,7 @@ msgstr ""
 "Det er bare et program som tilbyr %s\n"
 "(%s). Det er ingenting å konfigurere.\n"
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5437,45 +5438,51 @@ msgstr ""
 "  Valg         Alternativ\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr "Trykk Enter for å beholde forvalget[*] eller skriv et valgnummer:"
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "Bruker «%s» for å tilby «%s»'."
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Klarte ikke finne alternativ «%s»."
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "feil ved skriving til standard ut: %s"
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "linjeskift forbudt i update-alternatives filer (%s)"
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "feil eller slutt på filen under lesing av %s for %s (%s)"
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, perl-format
 msgid "missing newline after %s"
 msgstr "mangler linjeskift etter %s"
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Alvorlig problem: %s"
 
+#~ msgid "two modes specified: %s and --%s"
+#~ msgstr "to modi oppgitt: %s og --%s"
+
+#~ msgid "manflag"
+#~ msgstr "man-flagg"
+
 #~ msgid "%s: failed to exec gzip -dc"
 #~ msgstr "%s: klarte ikke kjøre «gzip -dc»"
 
diff --git a/po/ne.po b/po/ne.po
index 29dcb945..c942cec3 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg_po_ne\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+0300\n"
 "PO-Revision-Date: 2006-10-08 16:32+0545\n"
 "Last-Translator: Shiva Prasad Pokharel <pokharelshiva@hotmail.com>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
@@ -4354,7 +4354,7 @@ msgid "unable to close %s after read: %s"
 msgstr "पढे पछि %s बन्द गर्न अक्षम: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "%s बन्द गर्न अक्षम: %s"
@@ -4442,9 +4442,10 @@ msgstr ""
 "हटाउदा, --प्याकेज वा --स्थानिय र --यदि निर्दिष्ट गरिएमा फेराइ मिल्नु पर्दछ\n"
 "प्याकेज preinst/postrm स्क्रिप्टले सधै --प्याकेज र --फेराइ निर्दिष्ट गर्नु पर्दछ.\n"
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
-#, perl-format
-msgid "two modes specified: %s and --%s"
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
+#, fuzzy, perl-format
+msgid "two commands specified: %s and --%s"
 msgstr "दुई मोड निर्दिष्ट: %s र --%s"
 
 #: scripts/dpkg-divert.pl:111
@@ -4466,13 +4467,13 @@ msgid "package may not contain newlines"
 msgstr "प्याकेजले नयाँरेखा समावेश नगर्न सक्छ"
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s लाई <directory> आवश्यक पर्दछ"
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "अज्ञात विकल्प `%s'"
@@ -4625,7 +4626,7 @@ msgstr "नयाँ डाइभर्सन सिर्जना गर्न
 msgid "install new diversions: %s"
 msgstr "नयाँ डाइभर्सन स्थापना गर्नुहोस्: %s"
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "आन्तरिक त्रुटि: %s दुषित: %s"
@@ -5077,8 +5078,8 @@ msgstr ""
 "  --version                संस्करण देखाउनुहोस्\n"
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
-msgstr "manflag"
+msgid "invalid update mode"
+msgstr ""
 
 #: scripts/update-alternatives.pl:135
 #, perl-format
@@ -5112,92 +5113,92 @@ msgid ""
 "alternatives."
 msgstr "%s मा तोक्न %s का लागि विकल्प - जुन फेला परेन । विकल्पको सूचीबाट हटाउदैछ ।"
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s -  वस्तुस्थिति %s छ"
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr "%s मा हालैको बिन्दुमा लिङ्क गर्नुहोस्"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr "हालै अनुपस्थित लिङ्क गर्नुहोस्"
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr "पढ्न अयोग्य लिङ्क - %s"
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - प्राथमिकता %s"
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr "स्लेभ %s: %s"
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 msgid "No versions available."
 msgstr "संस्करण उपलब्ध छैन"
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "हालको उपयुक्त संस्करण %s हो ।"
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "अज्ञात तर्क `%s'"
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--स्थापनालाई आवश्यक <link> <name> <path> <priority>"
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr "प्राथमिकता इन्टिजर हुनुपर्दछ"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s लाई <name> <path> आवश्यक पर्दछ"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s लाई <name> आवश्यक पर्दछ"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr "--स्लेभलाई <link> <name> <path> आवश्यक पर्दछ"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr " %s स्लेभ नाम  नक्कल गरियो"
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "%s स्लेभ लिङ्क नक्कल गरियो"
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr " %s नाम प्राथमिक र स्लेभ दुबै हो"
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "%s लिङ्क प्राथमिक र स्लेभ दुबै हो"
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5205,31 +5206,31 @@ msgstr ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr "--स्लेभ केबल --स्थापनासँग स्विकृत हुन्छ"
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "%s का लागि विकल्प छैन"
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "%s को स्वचालित चयन सेट गर्दैछ"
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "%s हटाउन अक्षम: %s"
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5238,7 +5239,7 @@ msgstr ""
 "%s परिवर्तन गरिएको छ (म्यानुअली वा स्क्रिप्टद्वारा)\n"
 "म्यानुअल अद्यावधिकलाई मात्र स्विचिङ"
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5247,67 +5248,67 @@ msgstr ""
 "%s को उपलब्ध संस्करण जाँच, %s मा लिङ्क अद्याावधिक ...\n"
 "(आवश्यक परेमा तपाईँले सिमलिङ्क परिमार्जन गर्न सक्नुहुन्छ- `man ln' हेर्नुहोस् ।)"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "%s बाट %s मा %s लिङ्क पुन: नामकरण"
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "%s लाई %s मा पुन: नामकरण गर्न अक्षम: %s"
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "%s स्लेभ लिङ्क नाम नक्कल बनाइयो"
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "%s बाट %s मा स्लेभ लिङ्क %s पुन: नामकरण  "
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "म्यानुअली चयन गरिएको विकल्प हटाउदैछ - स्वत: मोडमा स्विच गर्दैछ"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "%s का लागि %s विकल्प दर्ता गरिएको छैन, हटाइएको छैन ।"
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "छुटेको स्लेभ लिङ्क %s (%s) परित्याग गर्दैछ"
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr " %s को स्वचालित अद्यावधिक अक्षम पारियो, यसलाई छोड्नुहोस् ।"
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr "स्वचालित अद्यावधिक फर्काउन अद्यावधिक-विकल्पहरू--स्वत %s' प्रयोग गर्नुहोस् ।"
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr " %s ...को अघिल्लो असफल अद्यावधिकबाट पुन: प्राप्त गर्दैछ ।"
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "लेख्नका लागि %s खोल्न अक्षम: %s"
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "%s (%s) प्रदान गर्ने अन्तिम प्याकेज हटाइयो, यसलाई मेट्दैछ ।"
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5316,38 +5317,38 @@ msgstr ""
 "चेतावनी: %s लाई %s मा सिमलिङ्क भएको मानिन्छ\n"
 " (वा अवस्थित नरहेको); यद्यपी, रिडलिङ्क असफल: %s"
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "%s अवस्थित नरहेको यकिन गर्न अक्षम: %s"
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "%s मा %s सिमलिङ्क बनाउन अक्षम: %s"
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "%s को रूपमा %s स्थापना गर्न अक्षम: %s"
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "%s मा तोक्न %s (%s) छोड्दैछ"
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "%s मा तोक्न %s (%s) अद्यावधिक गर्दैछ"
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5356,13 +5357,13 @@ msgstr ""
 "चेतावनी : %s लाई\n"
 " %s मा स्लेभ सिमलिङ्क, वा अवस्थित नरहेको मानिन्छ; यद्यपी, रिडलिङ्क असफल भयो: %s"
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "%s (%s) हटाउदैछ, %s सँग उपयुक्त छैन ।"
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5371,7 +5372,7 @@ msgstr ""
 "त्यहाँ %s प्रदान गर्ने केबल १ कार्यक्रम मात्र छ\n"
 "(%s). कन्फिगर गर्न केहि पनि छैन ।\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5380,7 +5381,7 @@ msgstr ""
 "त्यहाँ %s प्रदान गर्ने केबल १ कार्यक्रम मात्र छ\n"
 "(%s). कन्फिगर गर्न केहि पनि छैन ।\n"
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5393,45 +5394,51 @@ msgstr ""
 "  चयन    विकल्प\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr "पूर्वनिर्धारित [*] राख्न 'प्रविष्ट गर्नुहोस्' थिच्नुहोस्, वा चयन सङ्ख्या टाइप गर्नुहोस्"
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr " `%s' प्रदान गर्न `%s' प्रयोग गर्दैछ"
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "`%s' विकल्प फेला पार्न सकिदैन ।"
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "stdout लेख्दा त्रुटि: %s"
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "अद्यावधिक-वैकल्पिक फाइलहरू (%s) मा नयाँरेखा निषेधित गरिएको छ"
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "%s (%s) का लागि त्रुटि वा eof पढाइ %s"
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, perl-format
 msgid "missing newline after %s"
 msgstr "%s पछि हराइरहेको नयाँरेखा"
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "गम्भीर समस्या: %s"
 
+#~ msgid "two modes specified: %s and --%s"
+#~ msgstr "दुई मोड निर्दिष्ट: %s र --%s"
+
+#~ msgid "manflag"
+#~ msgstr "manflag"
+
 #~ msgid "%s: failed to exec gzip -dc"
 #~ msgstr "%s: gzip -dc कार्यान्वयन गर्न असफल"
 
diff --git a/po/nl.po b/po/nl.po
index 3bdfdbd8..4ba3de2b 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: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+0300\n"
 "PO-Revision-Date: 2007-05-10 16:19+0100\n"
 "Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
 "Language-Team: Dutch <debian-l10n-dutch@debian.org>\n"
@@ -123,13 +123,20 @@ msgstr "schrijven is mislukt tijdens frommelrapport"
 
 #: lib/dbmodify.c:59
 #, c-format
-msgid "updates directory contains file `%.250s' whose name is too long (length=%d, max=%d)"
-msgstr "de map updates bevat een bestand `%.250s' waarvan de naam te lang is (lengte=%d, max=%d)"
+msgid ""
+"updates directory contains file `%.250s' whose name is too long (length=%d, "
+"max=%d)"
+msgstr ""
+"de map updates bevat een bestand `%.250s' waarvan de naam te lang is (lengte="
+"%d, max=%d)"
 
 #: lib/dbmodify.c:63
 #, c-format
-msgid "updates directory contains files with different length names (both %d and %d)"
-msgstr "de map updates bevat bestanden met namen van verschillende lengte (zowel %d als %d)"
+msgid ""
+"updates directory contains files with different length names (both %d and %d)"
+msgstr ""
+"de map updates bevat bestanden met namen van verschillende lengte (zowel %d "
+"als %d)"
 
 #: lib/dbmodify.c:77
 #, c-format
@@ -141,9 +148,7 @@ msgstr "kan 'updates'-map `%.255s' niet scannen"
 msgid "failed to remove incorporated update file %.255s"
 msgstr "verwijderen van in rekening genomen 'update'-bestand %.255s is mislukt"
 
-#: lib/dbmodify.c:111
-#: src/archives.c:601
-#: dpkg-deb/build.c:319
+#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr "kan `%.255s' niet aanmaken"
@@ -173,7 +178,9 @@ msgstr "kan niet binnen bij het statusgebied van dpkg"
 
 #: lib/dbmodify.c:157
 msgid "operation requires read/write access to dpkg status area"
-msgstr "voor deze bewerking zijn lees- en schrijfrechten nodig in het dpkg statusgebied"
+msgstr ""
+"voor deze bewerking zijn lees- en schrijfrechten nodig in het dpkg "
+"statusgebied"
 
 #: lib/dbmodify.c:205
 #, c-format
@@ -328,12 +335,15 @@ msgstr "veld voor bestandsdetails `%s' niet toegestaan in statusbestand"
 #: lib/fields.c:104
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
-msgstr "te veel waarden in veld voor bestandsdetails `%s' (vergeleken met anderen)"
+msgstr ""
+"te veel waarden in veld voor bestandsdetails `%s' (vergeleken met anderen)"
 
 #: lib/fields.c:117
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
-msgstr "te weinig waarden in het veld voor bestandsdetails `%s' (vergeleken met anderen)"
+msgstr ""
+"te weinig waarden in het veld voor bestandsdetails `%s' (vergeleken met "
+"anderen)"
 
 #: lib/fields.c:133
 msgid "yes/no in boolean field"
@@ -385,7 +395,8 @@ msgstr "waarde voor `conffiles' heeft een verkeerd opgemaakte regel `%.*s'"
 #: lib/fields.c:265
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
-msgstr "waarde voor `conffiles' heeft een regel die niet begint met een spatie (`%c')"
+msgstr ""
+"waarde voor `conffiles' heeft een regel die niet begint met een spatie (`%c')"
 
 #: lib/fields.c:281
 msgid "root or null directory is listed as a conffile"
@@ -393,8 +404,11 @@ msgstr "hoofd- of null-map wordt genoemd als een conffile"
 
 #: lib/fields.c:337
 #, c-format
-msgid "`%s' field, missing package name, or garbage where package name expected"
-msgstr "`%s'-veld, ontbrekende pakketnaam, of rommel waar een pakketnaam werd verwacht"
+msgid ""
+"`%s' field, missing package name, or garbage where package name expected"
+msgstr ""
+"`%s'-veld, ontbrekende pakketnaam, of rommel waar een pakketnaam werd "
+"verwacht"
 
 #: lib/fields.c:340
 #, c-format
@@ -439,10 +453,10 @@ msgid ""
 " version value starts with non-alphanumeric, suggest adding a space"
 msgstr ""
 "`%s'-veld, verwijzing naar `%.255s':\n"
-" versiewaarde begint met een niet-alfanumeriek teken, voeg bijv. een spatie toe"
+" versiewaarde begint met een niet-alfanumeriek teken, voeg bijv. een spatie "
+"toe"
 
-#: lib/fields.c:413
-#: lib/fields.c:416
+#: lib/fields.c:413 lib/fields.c:416
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr "`%s'-veld, verwijzing naar `%.255s': versie bevat `%c'"
@@ -473,7 +487,8 @@ msgstr "kan dpkg status database niet ontgrendelen"
 
 #: lib/lock.c:65
 msgid "you do not have permission to lock the dpkg status database"
-msgstr "u heeft de benodigde rechten niet om dpkg statusdatabase te vergrendelen"
+msgstr ""
+"u heeft de benodigde rechten niet om dpkg statusdatabase te vergrendelen"
 
 #: lib/lock.c:66
 msgid "unable to open/create status database lockfile"
@@ -492,8 +507,7 @@ msgstr "kan de 'dpkg'-statusdatabase niet vergrendelen"
 msgid "malloc failed (%ld bytes)"
 msgstr "malloc is mislukt (%ld bytes)"
 
-#: lib/mlib.c:64
-#: dpkg-deb/info.c:98
+#: lib/mlib.c:64 dpkg-deb/info.c:98
 #, c-format
 msgid "realloc failed (%ld bytes)"
 msgstr "realloc is mislukt (%ld bytes)"
@@ -536,8 +550,7 @@ msgstr "subproces %s gaf een foutwaarde %d terug"
 msgid "dpkg: warning - %s killed by signal (%s)%s\n"
 msgstr "dpkg: waarschuwing - %s gedood door signaal (%s)%s\n"
 
-#: lib/mlib.c:122
-#: lib/mlib.c:125
+#: lib/mlib.c:122 lib/mlib.c:125
 msgid ", core dumped"
 msgstr ", kern gedumpt"
 
@@ -646,8 +659,7 @@ msgstr "leesfout in configuratiebestand `%.255s'"
 msgid "error closing configuration file `%.255s'"
 msgstr "fout bij sluiten van configuratiebestand `%.255s'"
 
-#: lib/myopt.c:94
-#: lib/myopt.c:102
+#: lib/myopt.c:94 lib/myopt.c:102
 msgid "Error allocating memory for cfgfilename"
 msgstr "Fout bij het toewijzen van geheugen voor cfgfilename"
 
@@ -729,7 +741,8 @@ msgstr "veldnaam `%.*s' moet gevolgd worden door een dubbele punt"
 #: lib/parse.c:170
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
-msgstr "EOF voor waarde voor veld `%.*s' (ontbrekende afsluitende nieuwe regel)"
+msgstr ""
+"EOF voor waarde voor veld `%.*s' (ontbrekende afsluitende nieuwe regel)"
 
 #: lib/parse.c:174
 #, c-format
@@ -766,7 +779,8 @@ msgstr "'Configured-Version' van pakket met ongepaste status"
 
 #: lib/parse.c:274
 msgid "Package which in state not-installed has conffiles, forgetting them"
-msgstr "Pakket in toestand `not-installed' heeft conffiles, deze worden vergeten"
+msgstr ""
+"Pakket in toestand `not-installed' heeft conffiles, deze worden vergeten"
 
 #: lib/parse.c:331
 #, c-format
@@ -816,7 +830,9 @@ msgstr "moet beginnen met een alfanumeriek teken"
 #: lib/parsehelp.c:123
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
-msgstr "teken `%c' is niet toegestaan (enkel letters, cijfers en de karakters '%s' zijn toegestaan)"
+msgstr ""
+"teken `%c' is niet toegestaan (enkel letters, cijfers en de karakters '%s' "
+"zijn toegestaan)"
 
 #: lib/parsehelp.c:178
 msgid "<none>"
@@ -879,22 +895,24 @@ msgstr "fout bij het lezen uit de 'dpkg-deb'-pijp"
 msgid "error setting timestamps of `%.255s'"
 msgstr "fout bij het instellen van de tijd van `%.255s'"
 
-#: src/archives.c:273
-#: src/archives.c:618
+#: src/archives.c:273 src/archives.c:618
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr "fout bij het instellen van de eigenaar van `%.255s'"
 
-#: src/archives.c:275
-#: src/archives.c:621
+#: src/archives.c:275 src/archives.c:621
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr "fout bij het instellen van de permissies op `%.255s'"
 
 #: src/archives.c:368
 #, c-format
-msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s%.100s%.10s"
-msgstr "poging tot overschrijven van `%.250s', wat een omgeleide versie is van `%.250s'%.10s%.100s%.10s"
+msgid ""
+"trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
+"%.100s%.10s"
+msgstr ""
+"poging tot overschrijven van `%.250s', wat een omgeleide versie is van `"
+"%.250s'%.10s%.100s%.10s"
 
 #: src/archives.c:372
 msgid " (package: "
@@ -903,17 +921,24 @@ msgstr " (pakket: "
 #: src/archives.c:394
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
-msgstr "kan de status van `%.255s' niet opvragen (die ik net wilde gaan installeren)"
+msgstr ""
+"kan de status van `%.255s' niet opvragen (die ik net wilde gaan installeren)"
 
 #: src/archives.c:402
 #, c-format
-msgid "unable to clean up mess surrounding `%.255s' before installing another version"
-msgstr "kan de rommel rond `%.255s' niet opruimen alvorens een nieuwe versie te installeren"
+msgid ""
+"unable to clean up mess surrounding `%.255s' before installing another "
+"version"
+msgstr ""
+"kan de rommel rond `%.255s' niet opruimen alvorens een nieuwe versie te "
+"installeren"
 
 #: src/archives.c:408
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
-msgstr "kan de status van de teruggezette `%.255s' niet opvragen voor de installatie van een nieuwe versie"
+msgstr ""
+"kan de status van de teruggezette `%.255s' niet opvragen voor de installatie "
+"van een nieuwe versie"
 
 #: src/archives.c:440
 #, c-format
@@ -932,8 +957,11 @@ msgstr "Vervangen door bestanden in ge
 
 #: src/archives.c:509
 #, c-format
-msgid "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
-msgstr "poging tot overschrijven van map `%.250s' in pakket %.250s met iets dat geen map is"
+msgid ""
+"trying to overwrite directory `%.250s' in package %.250s with nondirectory"
+msgstr ""
+"poging tot overschrijven van map `%.250s' in pakket %.250s met iets dat geen "
+"map is"
 
 #: src/archives.c:519
 #, c-format
@@ -960,8 +988,7 @@ msgstr "fout bij het sluiten van/schrijven naar `%.255s'"
 msgid "error creating pipe `%.255s'"
 msgstr "fout bij het aanmaken van de pijp `%.255s'"
 
-#: src/archives.c:635
-#: src/archives.c:641
+#: src/archives.c:635 src/archives.c:641
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr "fout bij het aanmaken van het apparaatbestand `%.255s'"
@@ -976,11 +1003,11 @@ msgstr "fout bij het maken van de vaste koppeling `%.255s'"
 msgid "error creating symbolic link `%.255s'"
 msgstr "fout bij het maken van de symbolische koppeling `%.255s'"
 
-#: src/archives.c:663
-#: src/archives.c:668
+#: src/archives.c:663 src/archives.c:668
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
-msgstr "fout bij het instellen van de eigenaar van de symbolische koppeling `%.255s'"
+msgstr ""
+"fout bij het instellen van de eigenaar van de symbolische koppeling `%.255s'"
 
 #: src/archives.c:674
 #, c-format
@@ -1002,8 +1029,7 @@ msgstr "kan koppeling niet lezen uit `%.255s'"
 msgid "unable to make backup symlink for `%.255s'"
 msgstr "kan geen reservekoppeling maken voor `%.255s'"
 
-#: src/archives.c:725
-#: src/archives.c:728
+#: src/archives.c:725 src/archives.c:728
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr "kan de eigenaar van de reservekoppeling niet instellen voor `%.255s'"
@@ -1011,7 +1037,9 @@ msgstr "kan de eigenaar van de reservekoppeling niet instellen voor `%.255s'"
 #: src/archives.c:733
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
-msgstr "kan geen reservekoppeling van `%.255s' maken voor de installatie van de nieuwe versie"
+msgstr ""
+"kan geen reservekoppeling van `%.255s' maken voor de installatie van de "
+"nieuwe versie"
 
 #: src/archives.c:757
 #, c-format
@@ -1024,7 +1052,8 @@ msgid ""
 "dpkg: warning - ignoring dependency problem with removal of %s:\n"
 "%s"
 msgstr ""
-"dpkg: waarschuwing - vereistenprobleem bij het verwijderen van %s wordt genegeerd:\n"
+"dpkg: waarschuwing - vereistenprobleem bij het verwijderen van %s wordt "
+"genegeerd:\n"
 "%s"
 
 #: src/archives.c:796
@@ -1067,12 +1096,18 @@ msgstr "%s is niet goed ge
 #: src/archives.c:878
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
-msgstr "dpkg: mogelijk geeft het verwijderen van %s problemen, aangezien het %s voorziet ...\n"
+msgstr ""
+"dpkg: mogelijk geeft het verwijderen van %s problemen, aangezien het %s "
+"voorziet ...\n"
 
 #: src/archives.c:893
 #, c-format
-msgid "dpkg: package %s requires reinstallation, but will remove anyway as you request.\n"
-msgstr "dpkg: pakket %s behoeft herinstallatie, op uw aanvraag wordt het toch verwijderd.\n"
+msgid ""
+"dpkg: package %s requires reinstallation, but will remove anyway as you "
+"request.\n"
+msgstr ""
+"dpkg: pakket %s behoeft herinstallatie, op uw aanvraag wordt het toch "
+"verwijderd.\n"
 
 #: src/archives.c:896
 #, c-format
@@ -1106,7 +1141,8 @@ msgstr "conflicterende pakketten - %.250s wordt niet ge
 #: src/archives.c:921
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
-msgstr "dpkg: let op - conflict wordt genegeerd, mogelijk wordt er doorgegaan!\n"
+msgstr ""
+"dpkg: let op - conflict wordt genegeerd, mogelijk wordt er doorgegaan!\n"
 
 #: src/archives.c:959
 #, c-format
@@ -1136,7 +1172,9 @@ msgstr "find voor --recursive gaf onafgehandelde fout %i"
 
 #: src/archives.c:1007
 msgid "searched, but found no packages (files matching *.deb)"
-msgstr "er is gekeken, maar er zijn geen pakketten gevonden (bestanden die overeenkomen met *.deb)"
+msgstr ""
+"er is gekeken, maar er zijn geen pakketten gevonden (bestanden die "
+"overeenkomen met *.deb)"
 
 #: src/archives.c:1023
 #, c-format
@@ -1166,12 +1204,18 @@ msgstr "%s - let op: %.250s wordt gedegradeerd van %.250s naar %.250s.\n"
 #: src/archives.c:1127
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
-msgstr "%.250s wordt niet gedegradeerd van versie %.250s naar %.250s, maar wordt overgeslagen.\n"
+msgstr ""
+"%.250s wordt niet gedegradeerd van versie %.250s naar %.250s, maar wordt "
+"overgeslagen.\n"
 
 #: src/cleanup.c:83
 #, c-format
-msgid "unable to remove newly-installed version of `%.250s' to allow reinstallation of backup copy"
-msgstr "kan de nieuw geïnstalleerde versie van `%.250s' niet verwijderen om de reservekopie weer te installeren"
+msgid ""
+"unable to remove newly-installed version of `%.250s' to allow reinstallation "
+"of backup copy"
+msgstr ""
+"kan de nieuw geïnstalleerde versie van `%.250s' niet verwijderen om de "
+"reservekopie weer te installeren"
 
 #: src/cleanup.c:90
 #, c-format
@@ -1191,7 +1235,8 @@ msgstr "kan de nieuw ge
 #: src/configure.c:92
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
-msgstr "een pakket met de naam `%s' is niet geïnstalleerd, kan het niet configureren"
+msgstr ""
+"een pakket met de naam `%s' is niet geïnstalleerd, kan het niet configureren"
 
 #: src/configure.c:94
 #, c-format
@@ -1226,7 +1271,8 @@ msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you request:\n"
 "%s"
 msgstr ""
-"dpkg: %s: vereistenproblemen, maar wordt toch geconfigureerd zoals gevraagd:\n"
+"dpkg: %s: vereistenproblemen, maar wordt toch geconfigureerd zoals "
+"gevraagd:\n"
 "%s"
 
 #: src/configure.c:130
@@ -1245,13 +1291,14 @@ msgstr "Instellen van %s (%s) ...\n"
 #: src/configure.c:180
 #, c-format
 msgid "unable to stat new dist conffile `%.250s'"
-msgstr "kan de status van de nieuw gedistribueerde conffile `%.250s' niet opvragen"
+msgstr ""
+"kan de status van de nieuw gedistribueerde conffile `%.250s' niet opvragen"
 
-#: src/configure.c:190
-#: src/configure.c:431
+#: src/configure.c:190 src/configure.c:431
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
-msgstr "kan de status van de huidig geïnstalleerde conffile `%.250s' niet opvragen"
+msgstr ""
+"kan de status van de huidig geïnstalleerde conffile `%.250s' niet opvragen"
 
 #: src/configure.c:199
 #, c-format
@@ -1267,12 +1314,15 @@ msgstr ""
 #: src/configure.c:233
 #, c-format
 msgid "dpkg: %s: warning - failed to remove old backup `%.250s': %s\n"
-msgstr "dpkg: %s: waarschuwing - kan oude reservekopie `%.250s' niet verwijderen: %s\n"
+msgstr ""
+"dpkg: %s: waarschuwing - kan oude reservekopie `%.250s' niet verwijderen: %"
+"s\n"
 
 #: src/configure.c:241
 #, c-format
 msgid "dpkg: %s: warning - failed to rename `%.250s' to `%.250s': %s\n"
-msgstr "dpkg: %s: waarschuwing - kan `%.250s' niet hernoemen naar `%.250s': %s\n"
+msgstr ""
+"dpkg: %s: waarschuwing - kan `%.250s' niet hernoemen naar `%.250s': %s\n"
 
 #: src/configure.c:249
 #, c-format
@@ -1282,17 +1332,23 @@ msgstr "dpkg: %s: waarschuwing - kan `%.250s' niet verwijderen: %s\n"
 #: src/configure.c:257
 #, c-format
 msgid "dpkg: %s: warning - failed to remove old distrib version `%.250s': %s\n"
-msgstr "dpkg: %s: waarschuwing - kan oude gedistribueerde versie `%.250s' niet verwijderen: %s\n"
+msgstr ""
+"dpkg: %s: waarschuwing - kan oude gedistribueerde versie `%.250s' niet "
+"verwijderen: %s\n"
 
 #: src/configure.c:262
 #, c-format
 msgid "dpkg: %s: warning - failed to remove `%.250s' (before overwrite): %s\n"
-msgstr "dpkg: %s: waarschuwing - kan `%.250s' niet verwijderen (voor overschrijven): %s\n"
+msgstr ""
+"dpkg: %s: waarschuwing - kan `%.250s' niet verwijderen (voor overschrijven): "
+"%s\n"
 
 #: src/configure.c:267
 #, c-format
 msgid "dpkg: %s: warning - failed to link `%.250s' to `%.250s': %s\n"
-msgstr "dpkg: %s: waarschuwing - kan `%.250s' niet naar `%.250s' laten verwijzen: %s\n"
+msgstr ""
+"dpkg: %s: waarschuwing - kan `%.250s' niet naar `%.250s' laten verwijzen: %"
+"s\n"
 
 #: src/configure.c:271
 #, c-format
@@ -1310,7 +1366,8 @@ msgid ""
 "dpkg: %s: warning - unable to stat config file `%s'\n"
 " (= `%s'): %s\n"
 msgstr ""
-"dpkg: %s: waarschuwing - kan de status van configuratiebestand `%s' niet opvragen\n"
+"dpkg: %s: waarschuwing - kan de status van configuratiebestand `%s' niet "
+"opvragen\n"
 " (= `%s'): %s\n"
 
 #: src/configure.c:347
@@ -1319,7 +1376,8 @@ msgid ""
 "dpkg: %s: warning - config file `%s' is a circular link\n"
 " (= `%s')\n"
 msgstr ""
-"dpkg: %s: waarschuwing - configuratiebestand `%s' is een circulaire verwijzing\n"
+"dpkg: %s: waarschuwing - configuratiebestand `%s' is een circulaire "
+"verwijzing\n"
 " (= `%s')\n"
 
 #: src/configure.c:360
@@ -1337,13 +1395,18 @@ msgid ""
 "dpkg: %s: warning - conffile `%.250s' resolves to degenerate filename\n"
 " (`%s' is a symlink to `%s')\n"
 msgstr ""
-"dpkg: %s: waarschuwing - configuratiebestand `%.250s' verwijst naar een verouderde bestandsnaam\n"
+"dpkg: %s: waarschuwing - configuratiebestand `%.250s' verwijst naar een "
+"verouderde bestandsnaam\n"
 " (`%s' is een symbolische koppeling naar `%s')\n"
 
 #: src/configure.c:393
 #, c-format
-msgid "dpkg: %s: warning - conffile `%.250s' is not a plain file or symlink (= `%s')\n"
-msgstr "dpkg: %s: waarschuwing - configuratiebestand `%.250s' is niet een gewoon bestand of symbolische koppeling (= `%s')\n"
+msgid ""
+"dpkg: %s: warning - conffile `%.250s' is not a plain file or symlink (= `%"
+"s')\n"
+msgstr ""
+"dpkg: %s: waarschuwing - configuratiebestand `%.250s' is niet een gewoon "
+"bestand of symbolische koppeling (= `%s')\n"
 
 #: src/configure.c:411
 msgid "md5hash"
@@ -1352,7 +1415,9 @@ msgstr "md5hash"
 #: src/configure.c:417
 #, c-format
 msgid "dpkg: %s: warning - unable to open conffile %s for hash: %s\n"
-msgstr "dpkg: %s: waarschuwing - kan configuratiebestand %s niet openen voor hash: %s\n"
+msgstr ""
+"dpkg: %s: waarschuwing - kan configuratiebestand %s niet openen voor hash: %"
+"s\n"
 
 #: src/configure.c:435
 #, c-format
@@ -1369,8 +1434,7 @@ msgstr "kan de modus van het nieuwe conffile `%.250s' niet veranderen"
 msgid "failed to run %s (%.250s)"
 msgstr "uitvoeren van %s is mislukt (%.250s)"
 
-#: src/configure.c:477
-#: src/configure.c:515
+#: src/configure.c:477 src/configure.c:515
 msgid "wait for shell failed"
 msgstr "wachten op shell is mislukt"
 
@@ -1385,7 +1449,8 @@ msgstr "kan de shell niet starten (%.250s)"
 
 #: src/configure.c:518
 msgid "Don't forget to foreground (`fg') this process when you're done !\n"
-msgstr "Vergeet niet om dit proces weer te activeren (`fg') als u klaar bent!\n"
+msgstr ""
+"Vergeet niet om dit proces weer te activeren (`fg') als u klaar bent!\n"
 
 #: src/configure.c:561
 #, c-format
@@ -1482,7 +1547,8 @@ msgstr ""
 "    Y of I  : installeer de versie van de pakketbeheerder\n"
 "    N of O  : behoudt de huidig geïnstalleerde versie\n"
 "      D     : toon de verschillen tussen de versies\n"
-"      Z     : stuur dit proces naar de achtergrond om de situatie te bekijken\n"
+"      Z     : stuur dit proces naar de achtergrond om de situatie te "
+"bekijken\n"
 
 #: src/configure.c:619
 #, c-format
@@ -1638,9 +1704,7 @@ msgstr "  %.250s bevat %.250s en wordt ge
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s bevat %.250s en is %s.\n"
 
-#: src/enquiry.c:56
-#: src/query.c:96
-#: src/query.c:139
+#: src/enquiry.c:56 src/query.c:96 src/query.c:139
 msgid "(no description available)"
 msgstr "(geen beschrijving beschikbaar)"
 
@@ -1718,13 +1782,16 @@ msgid ""
 "Version of dpkg with working epoch support not yet configured.\n"
 " Please use `dpkg --configure dpkg', and then try again.\n"
 msgstr ""
-"Versie van dpkg met werkende epoch ondersteuning is nog niet geconfigureerd.\n"
+"Versie van dpkg met werkende epoch ondersteuning is nog niet "
+"geconfigureerd.\n"
 "  Gelieve opnieuw te proberen met `dpkg --configure dpkg'.\n"
 
 #: src/enquiry.c:264
 #, c-format
 msgid "dpkg not recorded as installed, cannot check for epoch support !\n"
-msgstr "dpkg is niet als geïnstalleerd geregistreerd, kan niet controleren op ondersteuning voor epoch !\n"
+msgstr ""
+"dpkg is niet als geïnstalleerd geregistreerd, kan niet controleren op "
+"ondersteuning voor epoch !\n"
 
 #: src/enquiry.c:307
 msgid "--predep-package does not take any argument"
@@ -1742,22 +1809,24 @@ msgstr ""
 #: src/enquiry.c:360
 #, c-format
 msgid "cannot satisfy pre-dependencies for %.250s (wanted due to %.250s)"
-msgstr "kan niet voldoen aan voor-vereisten voor %.250s (gewenst wegens %.250s)"
+msgstr ""
+"kan niet voldoen aan voor-vereisten voor %.250s (gewenst wegens %.250s)"
 
 #: src/enquiry.c:377
 msgid "--print-architecture does not take any argument"
 msgstr "--print-architecture accepteert geen argumenten"
 
 #: src/enquiry.c:419
-msgid "--compare-versions takes three arguments: <version> <relation> <version>"
-msgstr "--compare-versions verwacht drie argumenten: <versie> <relatie> <versie>"
+msgid ""
+"--compare-versions takes three arguments: <version> <relation> <version>"
+msgstr ""
+"--compare-versions verwacht drie argumenten: <versie> <relatie> <versie>"
 
 #: src/enquiry.c:424
 msgid "--compare-versions bad relation"
 msgstr "--compare-versions foute relatie"
 
-#: src/enquiry.c:429
-#: src/enquiry.c:440
+#: src/enquiry.c:429 src/enquiry.c:440
 #, c-format
 msgid "dpkg: version '%s' has bad syntax: %s\n"
 msgstr "dpkg: versie '%s' heeft verkeerde syntax: %s\n"
@@ -1772,8 +1841,11 @@ msgstr ""
 " %s\n"
 
 #: src/errors.c:81
-msgid "dpkg: failed to allocate memory for new entry in list of failed packages."
-msgstr "dpkg: geheugen vrijmaken voor nieuwe ingang in lijst van is mislukt pakketten is mislukt."
+msgid ""
+"dpkg: failed to allocate memory for new entry in list of failed packages."
+msgstr ""
+"dpkg: geheugen vrijmaken voor nieuwe ingang in lijst van is mislukt "
+"pakketten is mislukt."
 
 #: src/errors.c:91
 #, c-format
@@ -1795,8 +1867,11 @@ msgstr "Pakket %s was on hold, wordt toch behandeld zoals gevraagd\n"
 
 #: src/errors.c:116
 #, c-format
-msgid "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
-msgstr "Pakket %s is on hold, wordt niet aangeraakt.  Gebruik --force-hold om te negeren.\n"
+msgid ""
+"Package %s is on hold, not touching it.  Use --force-hold to override.\n"
+msgstr ""
+"Pakket %s is on hold, wordt niet aangeraakt.  Gebruik --force-hold om te "
+"negeren.\n"
 
 #: src/errors.c:125
 msgid ""
@@ -1813,7 +1888,9 @@ msgstr "kan bestandenlijst-bestand niet openen voor pakket `%.250s'"
 
 #: src/filesdb.c:128
 #, c-format
-msgid "dpkg: serious warning: files list file for package `%.250s' missing, assuming package has no files currently installed.\n"
+msgid ""
+"dpkg: serious warning: files list file for package `%.250s' missing, "
+"assuming package has no files currently installed.\n"
 msgstr ""
 "dpkg: ernstige waarschuwing: bestandenlijst-bestand voor pakket\n"
 "`%.250s' ontbreekt, aangenomen wordt dat het pakket geen bestanden\n"
@@ -1827,7 +1904,8 @@ msgstr "bestandenlijst-bestand voor pakket `%.250s'"
 #: src/filesdb.c:158
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
-msgstr "bestandenlijst-bestand voor pakket `%.250s' bevat een lege bestandsnaam"
+msgstr ""
+"bestandenlijst-bestand voor pakket `%.250s' bevat een lege bestandsnaam"
 
 #: src/filesdb.c:170
 #, c-format
@@ -1852,7 +1930,8 @@ msgstr "kan bijgewerkt bestandenlijst-bestand voor pakket %s niet aanmaken"
 #: src/filesdb.c:250
 #, c-format
 msgid "failed to write to updated files list file for package %s"
-msgstr "kan niet schrijven naar bijgewerkt bestandenlijst-bestand voor pakket %s"
+msgstr ""
+"kan niet schrijven naar bijgewerkt bestandenlijst-bestand voor pakket %s"
 
 #: src/filesdb.c:252
 #, c-format
@@ -1862,7 +1941,8 @@ msgstr "kan bijgewerkt bestandenlijst-bestand voor pakket %s niet doorspoelen"
 #: src/filesdb.c:254
 #, c-format
 msgid "failed to sync updated files list file for package %s"
-msgstr "kan bijgewerkt bestandenlijst-bestand voor pakket %s niet synchroniseren"
+msgstr ""
+"kan bijgewerkt bestandenlijst-bestand voor pakket %s niet synchroniseren"
 
 #: src/filesdb.c:257
 #, c-format
@@ -1927,8 +2007,7 @@ msgstr "onverwachte EOF in omleidingen [ii]"
 msgid "fgets gave an empty string from diversions [ii]"
 msgstr "fgets gaf een lege string uit omleidingen [ii]"
 
-#: src/filesdb.c:486
-#: src/filesdb.c:497
+#: src/filesdb.c:486 src/filesdb.c:497
 msgid "diversions file has too-long line or EOF [ii]"
 msgstr "omleidingenbestand heeft een te lange regel of EOF [ii]"
 
@@ -2020,9 +2099,7 @@ msgstr "kan `%.250s' niet uitvoerbaar maken"
 msgid "unable to stat installed %s script `%.250s'"
 msgstr "kan de status van het geïnstalleerde %s script `%.250s' niet opvragen"
 
-#: src/help.c:301
-#: src/help.c:357
-#: src/help.c:377
+#: src/help.c:301 src/help.c:357 src/help.c:377
 #, c-format
 msgid "unable to execute %s"
 msgstr "kan %s niet uitvoeren"
@@ -2059,7 +2136,8 @@ msgstr "nieuw %s script"
 
 #: src/help.c:372
 msgid "there is no script in the new version of the package - giving up"
-msgstr "er is geen script in de nieuwe versie van het pakket - er wordt opgegeven"
+msgstr ""
+"er is geen script in de nieuwe versie van het pakket - er wordt opgegeven"
 
 #: src/help.c:374
 #, c-format
@@ -2079,8 +2157,7 @@ msgstr "delink"
 msgid "chmod"
 msgstr "chmod"
 
-#: src/help.c:497
-#: src/processarc.c:711
+#: src/help.c:497 src/processarc.c:711
 msgid "delete"
 msgstr "verwijder"
 
@@ -2089,8 +2166,7 @@ msgstr "verwijder"
 msgid "failed to %s `%%.255s'"
 msgstr "%s '%%.255s' is mislukt"
 
-#: src/help.c:513
-#: dpkg-deb/info.c:54
+#: src/help.c:513 dpkg-deb/info.c:54
 msgid "failed to exec rm for cleanup"
 msgstr "kan rm niet uitvoeren om op te ruimen"
 
@@ -2099,10 +2175,7 @@ msgstr "kan rm niet uitvoeren om op te ruimen"
 msgid "Debian `%s' package management program version %s.\n"
 msgstr "Debian '%s'  pakketbeheersprogramma versie %s.\n"
 
-#: src/main.c:46
-#: src/query.c:467
-#: dpkg-deb/main.c:48
-#: dpkg-split/main.c:41
+#: src/main.c:46 src/query.c:467 dpkg-deb/main.c:48 dpkg-split/main.c:41
 #, c-format
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -2113,10 +2186,7 @@ msgstr ""
 "of later voor kopiëervoorwaarden.  Er is GEEN garantie.\n"
 "Zie %s --license voor auteursrechten en licentiedetails.\n"
 
-#: src/main.c:57
-#: src/query.c:478
-#: dpkg-deb/main.c:56
-#: dpkg-split/main.c:49
+#: src/main.c:57 src/query.c:478 dpkg-deb/main.c:56 dpkg-split/main.c:49
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -2163,11 +2233,14 @@ msgstr ""
 "  -P|--purge        <pakketnaam>      ... | -a|--pending\n"
 "  --get-selections [<patroon> ...]    toon lijst selecties op stdout.\n"
 "  --set-selections                    neem pakketselecties van stdin.\n"
-"  --clear-selections                  Deselect alle niet-essentiële paketten.\n"
+"  --clear-selections                  Deselect alle niet-essentiële "
+"paketten.\n"
 "  --update-avail <Pakketbestand>   vervang de beschikbare pakketinfo.\n"
 "  --merge-avail <Pakketbestand>    samenvoegen met beschikbaar-info.\n"
-"  --clear-avail                           verwijder huidige beschikbaar-info.\n"
-"  --forget-old-unavail                vergeet niet-geïnstalleerde oude pakketten.\n"
+"  --clear-avail                           verwijder huidige beschikbaar-"
+"info.\n"
+"  --forget-old-unavail                vergeet niet-geïnstalleerde oude "
+"pakketten.\n"
 "  -s|--status <pakket-naam> ...       geef de status van pakket.\n"
 "  -p|--print-avail <pakket-naam> ...  geef beschikbaar-info versie details.\n"
 "  -L|--listfiles <pakket-naam> ...    geef bestanden die `van' pakket zijn.\n"
@@ -2176,13 +2249,11 @@ msgstr ""
 "  -C|--audit                               zoek naar kapotte pakketten.\n"
 "  --print-architecture                geef dpkg-architectuur weer.\n"
 "  --compare-versions <a> <rel> <b>    vergelijk versienummers (zie onder).\n"
-"  --force-help                            hulp over forceren  -Dh|--debug=help                  hulp over debuggen.\n"
+"  --force-help                            hulp over forceren  -Dh|--"
+"debug=help                  hulp over debuggen.\n"
 "\n"
 
-#: src/main.c:88
-#: src/query.c:492
-#: dpkg-deb/main.c:73
-#: dpkg-split/main.c:63
+#: src/main.c:88 src/query.c:492 dpkg-deb/main.c:73 dpkg-split/main.c:63
 #, c-format
 msgid ""
 "  -h|--help                        Show this help message.\n"
@@ -2223,16 +2294,21 @@ msgid ""
 "Options:\n"
 "  --admindir=<directory>     Use <directory> instead of %s.\n"
 "  --root=<directory>         Install on a different root directory.\n"
-"  --instdir=<directory>      Change installation dir without changing admin dir.\n"
-"  -O|--selected-only         Skip packages not selected for install/upgrade.\n"
+"  --instdir=<directory>      Change installation dir without changing admin "
+"dir.\n"
+"  -O|--selected-only         Skip packages not selected for install/"
+"upgrade.\n"
 "  -E|--skip-same-version     Skip packages whose same version is installed.\n"
-"  -G|--refuse-downgrade      Skip packages with earlier version than installed.\n"
-"  -B|--auto-deconfigure      Install even if it would break some other package.\n"
+"  -G|--refuse-downgrade      Skip packages with earlier version than "
+"installed.\n"
+"  -B|--auto-deconfigure      Install even if it would break some other "
+"package.\n"
 "  --no-debsig                Do not try to verify package signatures.\n"
 "  --no-act|--dry-run|--simulate\n"
 "                             Just say what we would do - don't do it.\n"
 "  -D|--debug=<octal>         Enable debugging (see -Dhelp or --debug=help).\n"
-"  --status-fd <n>            Send status change updates to file descriptor <n>.\n"
+"  --status-fd <n>            Send status change updates to file descriptor "
+"<n>.\n"
 "  --log=<filename>           Log status changes and actions to <filename>.\n"
 "  --ignore-depends=<package>,...\n"
 "                             Ignore dependencies involving <package>.\n"
@@ -2246,18 +2322,27 @@ msgstr ""
 "  --admindir=<map>       Gebruik <map> in plaats van %s\n"
 "  --root=<map>               Installeer op een systeem met andere hoofdmap\n"
 "  --instdir=<map>            Verander hoofdmap maar niet administratiemap\n"
-"  -O|--selected-only           Skip pakketten not selected for install/upgrade\n"
-"  -E|--skip-same-version    Skip pakketten met dezelfde versie als geïnstalleerd\n"
-"  -G|--refuse-downgrade    Skip pakketten met eerdere versie dan geïstalleerd\n"
-"  -B|--auto-deconfigure      Installeer zelfs als het een ander pakket vernielt\n"
-"  --no-debsig                      Verifieer geen digitale handtekeningen op pakketten\n"
+"  -O|--selected-only           Skip pakketten not selected for install/"
+"upgrade\n"
+"  -E|--skip-same-version    Skip pakketten met dezelfde versie als "
+"geïnstalleerd\n"
+"  -G|--refuse-downgrade    Skip pakketten met eerdere versie dan "
+"geïstalleerd\n"
+"  -B|--auto-deconfigure      Installeer zelfs als het een ander pakket "
+"vernielt\n"
+"  --no-debsig                      Verifieer geen digitale handtekeningen op "
+"pakketten\n"
 "  --no-act|--dry-run|--simulate\n"
-"                                          Meld wat dpkg zou doen, zonder het te doen\n"
+"                                          Meld wat dpkg zou doen, zonder het "
+"te doen\n"
 "  -D|--debug=<octal>       Activeer debug - zie -Dhelp of --debug=help\n"
-"  --status-fd <n>               Stuur status change updates naar file descriptor <n>\n"
-"  --log=<bestandsnaam> log statusveranderingen en acties naar <bestandsnaam>\n"
+"  --status-fd <n>               Stuur status change updates naar file "
+"descriptor <n>\n"
+"  --log=<bestandsnaam> log statusveranderingen en acties naar "
+"<bestandsnaam>\n"
 "   --ignore-depends=<pakket>,... Negeer vereisten bij <pakket>\n"
-"  --force-...                          Forceer oplossingen - zie --force-help\n"
+"  --force-...                          Forceer oplossingen - zie --force-"
+"help\n"
 "  --no-force-...|--refuse-...   Stop bij problemen\n"
 "  --abort-after <n>            Breek af na <n> fouten\n"
 "\n"
@@ -2266,21 +2351,27 @@ msgstr ""
 #, c-format
 msgid ""
 "Comparison operators for --compare-versions are:\n"
-"  lt le eq ne ge gt       (treat empty version as earlier than any version);\n"
+"  lt le eq ne ge gt       (treat empty version as earlier than any "
+"version);\n"
 "  lt-nl le-nl ge-nl gt-nl (treat empty version as later than any version);\n"
-"  < << <= = >= >> >       (only for compatibility with control file syntax).\n"
+"  < << <= = >= >> >       (only for compatibility with control file "
+"syntax).\n"
 "\n"
 msgstr ""
 "Vergelijkingsoperatoren voor --compare-versions:\n"
-" lt le eq ne ge gt       (geen versie wordt behandeld als eerder dan gelijk welke versie);\n"
-" lt-nl le-nl ge-nl gt-nl (geen versie wordt behandeld als eerder dan gelijk welke versie);\n"
-" < << <= = >= >> > (enkel voor compatibiliteit met de syntax van 'control-bestanden).\n"
+" lt le eq ne ge gt       (geen versie wordt behandeld als eerder dan gelijk "
+"welke versie);\n"
+" lt-nl le-nl ge-nl gt-nl (geen versie wordt behandeld als eerder dan gelijk "
+"welke versie);\n"
+" < << <= = >= >> > (enkel voor compatibiliteit met de syntax van 'control-"
+"bestanden).\n"
 "\n"
 
 #: src/main.c:134
 #, c-format
 msgid "Use `dselect' or `aptitude' for user-friendly package management.\n"
-msgstr "Gebruik `aptitude' of 'dselect' voor gebruikersvriendelijk pakketbeheer.\n"
+msgstr ""
+"Gebruik `aptitude' of 'dselect' voor gebruikersvriendelijk pakketbeheer.\n"
 
 #: src/main.c:141
 msgid ""
@@ -2289,23 +2380,25 @@ msgid ""
 "Type dpkg -Dhelp for a list of dpkg debug flag values;\n"
 "Type dpkg --force-help for a list of forcing options;\n"
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
-"Type dpkg --license for copyright license and lack of warranty (GNU GPL) [*].\n"
+"Type dpkg --license for copyright license and lack of warranty (GNU GPL) "
+"[*].\n"
 "\n"
-"Options marked [*] produce a lot of output - pipe it through `less' or `more' !"
+"Options marked [*] produce a lot of output - pipe it through `less' or "
+"`more' !"
 msgstr ""
-"Type dpkg --help voor hulp met installatie en deïnstallatie van pakketten [*];\n"
+"Type dpkg --help voor hulp met installatie en deïnstallatie van pakketten "
+"[*];\n"
 "Gebruik 'dselect' of 'aptitude' voor gebruikersvriendelijk pakketbeheer;\n"
 "Type dpkg -Dhelp voor een lijst van dpkg debugvlaggen;\n"
 "Type dpkg --force-help voor een lijst met forceer-opties;\n"
 "Type dpkg-deb --help voor hulp met manipuleren van *.deb bestanden;\n"
-"Type dpkg --license voor auteursrecht, licentie en ontbreken van garantie (GNU GPL) [*].\n"
+"Type dpkg --license voor auteursrecht, licentie en ontbreken van garantie "
+"(GNU GPL) [*].\n"
 "\n"
-"Opties gemarkeerd met [*] produceren een hoop uitvoer - pijp het door `less' of `more' !"
+"Opties gemarkeerd met [*] produceren een hoop uitvoer - pijp het door `less' "
+"of `more' !"
 
-#: src/main.c:206
-#: src/query.c:544
-#: dpkg-deb/main.c:177
-#: dpkg-split/main.c:157
+#: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr "tegenstrijdige acties -%c (--%s) en -%c (--%s)"
@@ -2359,15 +2452,16 @@ msgstr "--debug vereist een octaal argument"
 #: 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)"
+msgstr ""
+"lege pakketnaam in --ignore-depends lijst `%.250s' (gescheiden door komma's)"
 
 #: 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"
+msgstr ""
+"--ignore-depends vereist een toegestane pakketnaam. `%.250s' is dat niet; %s"
 
-#: src/main.c:287
-#: src/main.c:298
+#: src/main.c:287 src/main.c:298
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "ongeldig getal voor --%s: `%.250s'"
@@ -2383,23 +2477,28 @@ msgid ""
 "  downgrade [*]          Replace a package with a lower version\n"
 "  configure-any          Configure any package which may help this one\n"
 "  hold                   Process incidental packages even when on hold\n"
-"  bad-path               PATH is missing important programs, problems likely\n"
+"  bad-path               PATH is missing important programs, problems "
+"likely\n"
 "  not-root               Try to (de)install things even when not root\n"
 "  overwrite              Overwrite a file from one package with another\n"
-"  overwrite-diverted     Overwrite a diverted file with an undiverted version\n"
-"  bad-verify             Install a package even if it fails authenticity check\n"
+"  overwrite-diverted     Overwrite a diverted file with an undiverted "
+"version\n"
+"  bad-verify             Install a package even if it fails authenticity "
+"check\n"
 "  depends-version [!]    Turn dependency version problems into warnings\n"
 "  depends [!]            Turn all dependency problems into warnings\n"
 "  confnew [!]            Always use the new config files, don't prompt\n"
 "  confold [!]            Always use the old config files, don't prompt\n"
 "  confdef [!]            Use the default option for new config files if one\n"
-"                         is available, don't prompt. If no default can be found,\n"
+"                         is available, don't prompt. If no default can be "
+"found,\n"
 "                         you will be prompted unless one of the confold or\n"
 "                         confnew options is also given\n"
 "  confmiss [!]           Always install missing config files\n"
 "  conflicts [!]          Allow installation of conflicting packages\n"
 "  architecture [!]       Process even packages with wrong architecture\n"
-"  overwrite-dir [!]      Overwrite one package's directory with another's file\n"
+"  overwrite-dir [!]      Overwrite one package's directory with another's "
+"file\n"
 "  remove-reinstreq [!]   Remove packages which require installation\n"
 "  remove-essential [!]   Remove an essential package\n"
 "\n"
@@ -2412,29 +2511,43 @@ msgstr ""
 " Forceeropties:\n"
 "  all                    Zet alle forceer-opties\n"
 "  downgrade [*]          Vervang pakketten met een lagere versie\n"
-"  configure-any          Configureer een pakket dat kan helpen bij dit pakket\n"
+"  configure-any          Configureer een pakket dat kan helpen bij dit "
+"pakket\n"
 "  hold                   Behandel ook pakketten die op hold staan\n"
-"  bad-path               Belangrijke programma's ontbreken in PATH, waarschijnlijk problematisch\n"
-"  not-root               Probeer dingen te (de)installeren ook als niet-root\n"
-"  overwrite              Overschrijf een bestand uit het ene pakket met een ander\n"
-"  overwrite-diverted     Overschrijf een omleiding met een niet-omgeleide versie\n"
-"  bad-verify             Installeer een pakket zelfs al mislukt de verificatie\n"
-"  depends-version [!]    Verander vereistenproblemen met versies in waarschuwingen\n"
+"  bad-path               Belangrijke programma's ontbreken in PATH, "
+"waarschijnlijk problematisch\n"
+"  not-root               Probeer dingen te (de)installeren ook als niet-"
+"root\n"
+"  overwrite              Overschrijf een bestand uit het ene pakket met een "
+"ander\n"
+"  overwrite-diverted     Overschrijf een omleiding met een niet-omgeleide "
+"versie\n"
+"  bad-verify             Installeer een pakket zelfs al mislukt de "
+"verificatie\n"
+"  depends-version [!]    Verander vereistenproblemen met versies in "
+"waarschuwingen\n"
 "  depends [!]            Verander alle vereistenproblemen in waarschuwingen\n"
-"  confnew [!]            Gebruik altijd de nieuwe configuratiebestanden, vraag niets\n"
-"  confold [!]            Gebruik altijd de oude configuratiebestanden, vraag niets\n"
+"  confnew [!]            Gebruik altijd de nieuwe configuratiebestanden, "
+"vraag niets\n"
+"  confold [!]            Gebruik altijd de oude configuratiebestanden, vraag "
+"niets\n"
 "  confdef [!]            Gebruik altijd de standaardoptie voor nieuwe\n"
 "                         configuratiebestanden, vraag niets.  Als geen\n"
 "                         standaard is gevonden wordt het gevraagd\n"
 "                         tenzij ook confold of confnew opgegeven is\n"
-"  confmiss [!]           Installeer altijd ontbrekende configuratiebestanden\n"
+"  confmiss [!]           Installeer altijd ontbrekende "
+"configuratiebestanden\n"
 "  conflicts [!]          Sta installatie van conflicterende pakketten toe\n"
-"  architecture [!]       Behandel ook pakketten met een verkeerde architectuur\n"
-"  overwrite-dir [!]      Overschrijf een map in een pakket met een bestand uit een ander\n"
-"  remove-reinstreq [!]   Verwijder pakketten die herinstallatie nodig hebben\n"
+"  architecture [!]       Behandel ook pakketten met een verkeerde "
+"architectuur\n"
+"  overwrite-dir [!]      Overschrijf een map in een pakket met een bestand "
+"uit een ander\n"
+"  remove-reinstreq [!]   Verwijder pakketten die herinstallatie nodig "
+"hebben\n"
 "  remove-essential [!]   Verwijder een essentieel pakket\n"
 "\n"
-"WAARSCHUWING - het gebruik van de opties met [!] kunnen uw installatie ernstig beschadigen.\n"
+"WAARSCHUWING - het gebruik van de opties met [!] kunnen uw installatie "
+"ernstig beschadigen.\n"
 "Forceeropties gemarkeerd met [*] staan standaard aan.\n"
 
 #: src/main.c:363
@@ -2447,14 +2560,11 @@ msgstr "onbekende force/refuse optie `%.*s'"
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr "Let op: verouderde forceer/weiger optie `%s'\n"
 
-#: src/main.c:491
-#: src/main.c:501
-#: src/main.c:509
+#: src/main.c:491 src/main.c:501 src/main.c:509
 msgid "couldn't malloc in execbackend"
 msgstr "kan geen geheugen reserveren in exec-backend"
 
-#: src/main.c:495
-#: src/main.c:518
+#: src/main.c:495 src/main.c:518
 msgid "couldn't strdup in execbackend"
 msgstr "strdup is mislukt in exec-backend"
 
@@ -2485,10 +2595,7 @@ msgstr "kan `%i' niet openen voor stream"
 msgid "unexpected eof before end of line %d"
 msgstr "onverwacht bestandseinde voor einde regel %d"
 
-#: src/main.c:613
-#: src/main.c:628
-#: src/query.c:580
-#: dpkg-deb/main.c:202
+#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr "heb een actie-optie nodig"
@@ -2498,15 +2605,18 @@ msgstr "heb een actie-optie nodig"
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "--%s --pending accepteert geen niet-optie argumenten"
 
-#: src/packages.c:109
-#: src/query.c:321
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr "--%s heeft ten minste een pakketnaam argument nodig"
 
 #: src/packages.c:116
-msgid "you must specify packages by their own names, not by quoting the names of the files they come in"
-msgstr "u dient pakketten bij hun eigen namen op te geven, en dus niet met de naam van het bestand waar ze inzitten"
+msgid ""
+"you must specify packages by their own names, not by quoting the names of "
+"the files they come in"
+msgstr ""
+"u dient pakketten bij hun eigen namen op te geven, en dus niet met de naam "
+"van het bestand waar ze inzitten"
 
 #: src/packages.c:150
 #, c-format
@@ -2581,7 +2691,9 @@ msgstr "fout bij verifi
 
 #: src/processarc.c:117
 msgid "failed to exec dpkg-split to see if it's part of a multiparter"
-msgstr "kan dpkg-split niet uitvoeren om te zien of het een onderdeel is van meerdere delen"
+msgstr ""
+"kan dpkg-split niet uitvoeren om te zien of het een onderdeel is van "
+"meerdere delen"
 
 #: src/processarc.c:120
 msgid "wait for dpkg-split failed"
@@ -2688,7 +2800,8 @@ msgstr "Uitpakken van %s (uit %s) ...\n"
 #: src/processarc.c:321
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
-msgstr "naam van configuratiebestand (beginnend met `%.250s') is te lang (>%d tekens)"
+msgstr ""
+"naam van configuratiebestand (beginnend met `%.250s') is te lang (>%d tekens)"
 
 #: src/processarc.c:374
 #, c-format
@@ -2734,7 +2847,9 @@ msgstr "dpkg-deb: zap mogelijke nakomende nullen"
 #: src/processarc.c:621
 #, c-format
 msgid "dpkg: warning - could not stat old file `%.250s' so not deleting it: %s"
-msgstr "dpkg: waarschuwing - kan geen stat uitvoeren op het oude bestand `%.250s', bijgevolg wordt dit niet verwijdert: %s"
+msgstr ""
+"dpkg: waarschuwing - kan geen stat uitvoeren op het oude bestand `%.250s', "
+"bijgevolg wordt dit niet verwijdert: %s"
 
 #: src/processarc.c:629
 #, c-format
@@ -2743,8 +2858,12 @@ msgstr "dpkg: waarschuwing - kan de oude map `%.250s' niet verwijderen: %s\n"
 
 #: src/processarc.c:633
 #, c-format
-msgid "dpkg: warning - old conffile `%.250s' was an empty directory (and has now been deleted)\n"
-msgstr "dpkg: waarschuwing - oud configuratiebestand `%.250s' was een lege map (en is nu verwijderd)\n"
+msgid ""
+"dpkg: warning - old conffile `%.250s' was an empty directory (and has now "
+"been deleted)\n"
+msgstr ""
+"dpkg: waarschuwing - oud configuratiebestand `%.250s' was een lege map (en "
+"is nu verwijderd)\n"
 
 #: src/processarc.c:663
 #, c-format
@@ -2753,24 +2872,27 @@ msgstr "kan op het nieuwe bestand `%.250s' geen stat uitvoeren"
 
 #: src/processarc.c:674
 #, c-format
-msgid "dpkg: warning - old file `%.250s' is the same as several new files!  (both `%.250s' and `%.250s')\n"
-msgstr "dpkg: waarschuwing - het oude bestand `%.250s' is hetzelfde als verschillende nieuwe bestanden! ('%.250s' en '%.250s')\n"
+msgid ""
+"dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
+"%.250s' and `%.250s')\n"
+msgstr ""
+"dpkg: waarschuwing - het oude bestand `%.250s' is hetzelfde als "
+"verschillende nieuwe bestanden! ('%.250s' en '%.250s')\n"
 
 #: src/processarc.c:715
 #, c-format
 msgid "dpkg: warning - unable to %s old file `%%.250s': %%s\n"
 msgstr "dpkg: waarschuwing - kan oud bestand `%%.250s' niet %s: %%s\n"
 
-#: src/processarc.c:741
-#: src/processarc.c:982
-#: src/remove.c:292
+#: src/processarc.c:741 src/processarc.c:982 src/remove.c:292
 msgid "cannot read info directory"
 msgstr "kan info map niet lezen"
 
 #: src/processarc.c:754
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
-msgstr "oude versie van pakket heeft te lange infobestandsnaam beginnend met `%.250s'"
+msgstr ""
+"oude versie van pakket heeft te lange infobestandsnaam beginnend met `%.250s'"
 
 #: src/processarc.c:766
 #, c-format
@@ -2789,7 +2911,9 @@ msgstr "kan tijdelijke besturingsmap niet openen"
 #: src/processarc.c:785
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
-msgstr "bestandsnaam van het 'control'-infobestand van dit pakket is te lang (beginnend met `%.50s')"
+msgstr ""
+"bestandsnaam van het 'control'-infobestand van dit pakket is te lang "
+"(beginnend met `%.50s')"
 
 #: src/processarc.c:790
 #, c-format
@@ -2825,7 +2949,8 @@ msgstr "kan oude verdwijnende besturings infobestand `%.250s' niet verwijderen"
 msgid ""
 "Desired=Unknown/Install/Remove/Purge/Hold\n"
 "| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed\n"
-"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: uppercase=bad)\n"
+"|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: "
+"uppercase=bad)\n"
 msgstr ""
 "Gewenst=(U)Onbekend/Installeren/Remove/Purge/Hold\n"
 "| Status=Niet/geInstalleerd/Config/Uitgepakt/(F)config-mislukt/Half-geinst\n"
@@ -2843,9 +2968,7 @@ msgstr "Versie"
 msgid "Description"
 msgstr "Omschrijving"
 
-#: src/query.c:218
-#: src/query.c:453
-#: src/select.c:80
+#: src/query.c:218 src/query.c:453 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr "Geen pakketten gevonden overeenkomend met %s.\n"
@@ -2959,27 +3082,27 @@ msgstr ""
 "  --showformat=<formaat> Gebruik alternatief formaat voor --show\n"
 "\n"
 
-#: src/query.c:504
-#: dpkg-deb/main.c:97
+#: src/query.c:504 dpkg-deb/main.c:97
 #, c-format
 msgid ""
 "Format syntax:\n"
 "  A format is a string that will be output for each package. The format\n"
-"  can include the standard escape sequences \\n"
-" (newline), \\r (carriage\n"
+"  can include the standard escape sequences \\n (newline), \\r (carriage\n"
 "  return) or \\\\ (plain backslash). Package information can be included\n"
-"  by inserting variable references to package fields using the ${var[;width]}\n"
-"  syntax. Fields will be right-aligned unless the width is negative in which\n"
+"  by inserting variable references to package fields using the ${var[;"
+"width]}\n"
+"  syntax. Fields will be right-aligned unless the width is negative in "
+"which\n"
 "  case left alignment will be used.\n"
 msgstr ""
 "Formaat-syntax:\n"
 "  Een formaat is een string die voor elk pakket uitgeschreven wordt.\n"
 "  Het formaat mag standaard 'escape'-sequenties bevatten\n"
-"  \\n"
-" (newline), \\r (carriage return), \\\\ (gewone backslash). Pakket-\n"
+"  \\n (newline), \\r (carriage return), \\\\ (gewone backslash). Pakket-\n"
 "  formatie kan toegevoegd worden via variabele referenties naar\n"
 "  pakketvelden via de ${var[;breedte]} syntax. Velden worden rechts\n"
-"  uitgelijnd tenzij de breedte negatief is, in welk geval ze links uitgelijnd\n"
+"  uitgelijnd tenzij de breedte negatief is, in welk geval ze links "
+"uitgelijnd\n"
 "  worden.\n"
 
 #: src/query.c:514
@@ -2994,8 +3117,11 @@ msgstr ""
 
 #: src/remove.c:92
 #, c-format
-msgid "dpkg - warning: ignoring request to remove %.250s which isn't installed.\n"
-msgstr "dpkg - waarschuwing: verzoek om %.250s te verwijderen wordt genegeerd omdat het niet geïnstalleerd is.\n"
+msgid ""
+"dpkg - warning: ignoring request to remove %.250s which isn't installed.\n"
+msgstr ""
+"dpkg - waarschuwing: verzoek om %.250s te verwijderen wordt genegeerd omdat "
+"het niet geïnstalleerd is.\n"
 
 #: src/remove.c:100
 #, c-format
@@ -3051,14 +3177,16 @@ msgstr "Zou %s verwijderen of wissen ...\n"
 msgid "Removing %s ...\n"
 msgstr "%s wordt verwijderd ...\n"
 
-#: src/remove.c:257
-#: src/remove.c:374
+#: src/remove.c:257 src/remove.c:374
 #, c-format
-msgid "dpkg - warning: while removing %.250s, unable to remove directory `%.250s': %s - directory may be a mount point ?\n"
-msgstr "dpkg - waarschuwing: tijdens verwijderen van %.250s kan de map `%.250s' niet verwijderd worden: %s - is deze map een aanhechtpunt zijn?\n"
+msgid ""
+"dpkg - warning: while removing %.250s, unable to remove directory `%.250s': %"
+"s - directory may be a mount point ?\n"
+msgstr ""
+"dpkg - waarschuwing: tijdens verwijderen van %.250s kan de map `%.250s' niet "
+"verwijderd worden: %s - is deze map een aanhechtpunt zijn?\n"
 
-#: src/remove.c:264
-#: src/remove.c:381
+#: src/remove.c:264 src/remove.c:381
 #, c-format
 msgid "cannot remove `%.250s'"
 msgstr "kan `%.250s' niet verwijderen"
@@ -3075,8 +3203,12 @@ msgstr "kan besturingsinfo-bestand `%.250s' niet verwijderen"
 
 #: src/remove.c:368
 #, c-format
-msgid "dpkg - warning: while removing %.250s, directory `%.250s' not empty so not removed.\n"
-msgstr "dpkg - waarschuwing: tijdens verwijderen van %.250s, map `%.250s' niet leeg dus niet verwijderd.\n"
+msgid ""
+"dpkg - warning: while removing %.250s, directory `%.250s' not empty so not "
+"removed.\n"
+msgstr ""
+"dpkg - waarschuwing: tijdens verwijderen van %.250s, map `%.250s' niet leeg "
+"dus niet verwijderd.\n"
 
 #: src/remove.c:404
 #, c-format
@@ -3096,7 +3228,8 @@ msgstr "kan configuratiemap `%.250s' niet lezen (van `%.250s')"
 #: src/remove.c:504
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
-msgstr "kan oud backup configuratiebestand `%.250s' niet verwijderen (van `%.250s')"
+msgstr ""
+"kan oud backup configuratiebestand `%.250s' niet verwijderen (van `%.250s')"
 
 #: src/remove.c:540
 #, c-format
@@ -3174,7 +3307,9 @@ msgstr "kan niet bij de dpkg statusomgeving voor massale update"
 
 #: src/update.c:59
 msgid "bulk available update requires write access to dpkg status area"
-msgstr "grote bijwerking van de beschikbaarheidsdatabase vereist schrijftoegang tot de dpkg statusomgeving"
+msgstr ""
+"grote bijwerking van de beschikbaarheidsdatabase vereist schrijftoegang tot "
+"de dpkg statusomgeving"
 
 #: src/update.c:66
 #, c-format
@@ -3228,12 +3363,14 @@ msgid ""
 "dpkg-deb: warning, not checking contents of control area.\n"
 "dpkg-deb: building an unknown package in `%s'.\n"
 msgstr ""
-"dpkg-deb: waarschuwing, inhoud van het besturingsgebied is niet gecontroleerd.\n"
+"dpkg-deb: waarschuwing, inhoud van het besturingsgebied is niet "
+"gecontroleerd.\n"
 "dpkg-deb: bouwen van onbekend pakket in `%s'.\n"
 
 #: dpkg-deb/build.c:219
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
-msgstr "pakketnaam heeft tekens die niet kleine letters of cijfers of '-+.' zijn"
+msgstr ""
+"pakketnaam heeft tekens die niet kleine letters of cijfers of '-+.' zijn"
 
 #: dpkg-deb/build.c:221
 #, c-format
@@ -3258,17 +3395,23 @@ msgstr "dpkg-deb: bouwen van pakket `%s' in `%s'.\n"
 #: dpkg-deb/build.c:251
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
-msgstr "besturingsmap heeft foutieve permissies %03lo (moet >=0755 en <=0775 zijn)"
+msgstr ""
+"besturingsmap heeft foutieve permissies %03lo (moet >=0755 en <=0775 zijn)"
 
 #: dpkg-deb/build.c:262
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
-msgstr "beheerdersscript `%.50s' is niet een gewoon bestand of symbolische koppeling"
+msgstr ""
+"beheerdersscript `%.50s' is niet een gewoon bestand of symbolische koppeling"
 
 #: dpkg-deb/build.c:264
 #, c-format
-msgid "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and <=0775)"
-msgstr "beheerdersscript `%.50s' heeft foute permissies %03lo (moet >=0555 en <=0775 zijn)"
+msgid ""
+"maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
+"<=0775)"
+msgstr ""
+"beheerdersscript `%.50s' heeft foute permissies %03lo (moet >=0555 en <=0775 "
+"zijn)"
 
 #: dpkg-deb/build.c:268
 #, c-format
@@ -3281,8 +3424,11 @@ msgstr "lege string van fgets bij lezen configuratiebestanden"
 
 #: dpkg-deb/build.c:280
 #, c-format
-msgid "warning, conffile name `%.50s...' is too long, or missing final newline\n"
-msgstr "waarschuwing, configuratiebestandsnaam `%.50s...' is te lang, of afsluitende nieuwe regel ontbreekt\n"
+msgid ""
+"warning, conffile name `%.50s...' is too long, or missing final newline\n"
+msgstr ""
+"waarschuwing, configuratiebestandsnaam `%.50s...' is te lang, of afsluitende "
+"nieuwe regel ontbreekt\n"
 
 #: dpkg-deb/build.c:293
 #, c-format
@@ -3322,9 +3468,7 @@ msgstr "dpkg-deb: %d waarschuwingen over de besturingsbestand(en) genegeerd\n"
 msgid "unable to unbuffer `%.255s'"
 msgstr "kan `%.255s' niet ontbufferen"
 
-#: dpkg-deb/build.c:325
-#: dpkg-deb/build.c:398
-#: dpkg-deb/build.c:419
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr "chdir naar `%.255s' is mislukt"
@@ -3333,8 +3477,7 @@ msgstr "chdir naar `%.255s' is mislukt"
 msgid "failed to chdir to .../DEBIAN"
 msgstr "chdir naar ../DEBIAN is mislukt"
 
-#: dpkg-deb/build.c:327
-#: dpkg-deb/build.c:400
+#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
 msgid "failed to exec tar -cf"
 msgstr "uitvoeren van 'tar -cf' is mislukt"
 
@@ -3352,8 +3495,7 @@ msgstr "openen tmpfile (control), %s is mislukt"
 msgid "failed to unlink tmpfile (control), %s"
 msgstr "ontlinken van tmpfile (control), %s is mislukt"
 
-#: dpkg-deb/build.c:345
-#: dpkg-deb/build.c:374
+#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
 msgid "control"
 msgstr "besturingsbestand"
 
@@ -3379,8 +3521,7 @@ msgstr "openen tmpfile (data), %s is mislukt"
 msgid "failed to unlink tmpfile (data), %s"
 msgstr "ontlinken tmpfile (data), %s is mislukt"
 
-#: dpkg-deb/build.c:409
-#: dpkg-deb/extract.c:278
+#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
 msgid "data"
 msgstr "data"
 
@@ -3388,8 +3529,7 @@ msgstr "data"
 msgid "failed to exec find"
 msgstr "uitvoeren van find is mislukt"
 
-#: dpkg-deb/build.c:432
-#: dpkg-deb/build.c:439
+#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
 msgid "failed to write filename to tar pipe (data)"
 msgstr "schrijven va bestandsnaam naar de 'tar'-pijp (data) is mislukt"
 
@@ -3420,14 +3560,12 @@ msgstr "fout bij lezen van %s uit bestand %.255s"
 msgid "unexpected end of file in %s in %.255s"
 msgstr "onverwacht bestandseinde in %s op %.255s"
 
-#: dpkg-deb/extract.c:72
-#: dpkg-split/info.c:52
+#: dpkg-deb/extract.c:72 dpkg-split/info.c:52
 #, c-format
 msgid "file `%.250s' is corrupt - %.250s length contains nulls"
 msgstr "bestand `%.250s' is beschadigd - %.250s bevat nultekens"
 
-#: dpkg-deb/extract.c:79
-#: dpkg-split/info.c:43
+#: dpkg-deb/extract.c:79 dpkg-split/info.c:43
 #, c-format
 msgid "file `%.250s' is corrupt - bad digit (code %d) in %s"
 msgstr "bestand `%.250s' is beschadigd - foutief cijfer (code %d) in %s"
@@ -3449,11 +3587,12 @@ msgstr "versienummer"
 msgid "between members"
 msgstr "tussen leden"
 
-#: dpkg-deb/extract.c:117
-#: dpkg-split/info.c:95
+#: dpkg-deb/extract.c:117 dpkg-split/info.c:95
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of first header"
-msgstr "bestand `%.250s' is beschadigd - foute magische code na het einde van de eerste kop"
+msgstr ""
+"bestand `%.250s' is beschadigd - foute magische code na het einde van de "
+"eerste kop"
 
 #: dpkg-deb/extract.c:121
 #, c-format
@@ -3463,7 +3602,8 @@ msgstr "bestand `%.250s' is beschadigd - negatieve lidlengte %zi"
 #: dpkg-deb/extract.c:125
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
-msgstr "bestand `%.250s' is niet een debian binair archief (probeer dpkg-split?)"
+msgstr ""
+"bestand `%.250s' is niet een debian binair archief (probeer dpkg-split?)"
 
 #: dpkg-deb/extract.c:128
 msgid "header info member"
@@ -3482,8 +3622,7 @@ msgstr "archief heeft geen punt in het versienummer"
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr "archief versie %.250s niet begrepen, neem een nieuwere dpkg-deb"
 
-#: dpkg-deb/extract.c:146
-#: dpkg-deb/extract.c:179
+#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
 #, c-format
 msgid "skipped member data from %s"
 msgstr "lid data van %s overgeslagen"
@@ -3595,9 +3734,7 @@ msgstr "chdir naar de map is mislukt"
 msgid "failed to exec tar"
 msgstr "uitvoeren van tar is mislukt"
 
-#: dpkg-deb/extract.c:326
-#: dpkg-deb/extract.c:341
-#: dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr "--%s verwacht een .deb bestandsnaam argument"
@@ -3779,8 +3916,10 @@ msgid ""
 "  --nocheck                        Suppress control file check (build bad\n"
 "                                     packages).\n"
 "  -z#                              Set the compression level when building.\n"
-"  -Z<type>                         Set the compression type used when building.\n"
-"                                     Allowed values: gzip, bzip2, lzma, none.\n"
+"  -Z<type>                         Set the compression type used when "
+"building.\n"
+"                                     Allowed values: gzip, bzip2, lzma, "
+"none.\n"
 "\n"
 msgstr ""
 "Opties:\n"
@@ -3848,7 +3987,9 @@ msgstr "bestand `%.250s' is beschadigd - nultekens in infodeel"
 #: dpkg-split/info.c:116
 #, c-format
 msgid "file `%.250s' is format version `%.250s' - you need a newer dpkg-split"
-msgstr "bestand `%.250s' heeft indeling versie `%.250s' - u heeft een nieuwere dpkg-split nodig"
+msgstr ""
+"bestand `%.250s' heeft indeling versie `%.250s' - u heeft een nieuwere dpkg-"
+"split nodig"
 
 #: dpkg-split/info.c:124
 #, c-format
@@ -3868,7 +4009,8 @@ msgstr "bestand `%.250s' is beschadigd - foutief deelnummer"
 #: dpkg-split/info.c:145
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
-msgstr "bestand `%.250s' is beschadigd - foutieve magische code aan einde tweede kop"
+msgstr ""
+"bestand `%.250s' is beschadigd - foutieve magische code aan einde tweede kop"
 
 #: dpkg-split/info.c:147
 #, c-format
@@ -3878,12 +4020,15 @@ msgstr "bestand `%.250s' is beschadigd - tweede lid is niet een datalid"
 #: dpkg-split/info.c:153
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
-msgstr "bestand `%.250s' is beschadigd - foutief nummer voor onderdelen voor opgegeven groottes"
+msgstr ""
+"bestand `%.250s' is beschadigd - foutief nummer voor onderdelen voor "
+"opgegeven groottes"
 
 #: dpkg-split/info.c:157
 #, c-format
 msgid "file `%.250s' is corrupt - size is wrong for quoted part number"
-msgstr "bestand `%.250s' is beschadigd - grootte is fout voor opgegeven deelnummer"
+msgstr ""
+"bestand `%.250s' is beschadigd - grootte is fout voor opgegeven deelnummer"
 
 #: dpkg-split/info.c:163
 #, c-format
@@ -3895,8 +4040,7 @@ msgstr "kan onderdeelbestand `%.250s' niet vinden"
 msgid "file `%.250s' is corrupt - too short"
 msgstr "bestand `%.250s' is beschadigd - te kort"
 
-#: dpkg-split/info.c:181
-#: dpkg-split/info.c:222
+#: dpkg-split/info.c:181 dpkg-split/info.c:222
 #, c-format
 msgid "cannot open archive part file `%.250s'"
 msgstr "kan archiefonderdeel, bestand `%.250s' niet openen"
@@ -3962,7 +4106,8 @@ msgstr "klaar\n"
 #: dpkg-split/join.c:84
 #, c-format
 msgid "files `%.250s' and `%.250s' are not parts of the same file"
-msgstr "bestanden `%.250s' en `%.250s' zijn geen onderdelen van het zelfde bestand"
+msgstr ""
+"bestanden `%.250s' en `%.250s' zijn geen onderdelen van het zelfde bestand"
 
 #: dpkg-split/join.c:89
 #, c-format
@@ -4015,7 +4160,8 @@ msgid ""
 "Options:\n"
 "  --depotdir <directory>           Use <directory> instead of %s/%s.\n"
 "  -S|--partsize <size>             In KiB, for -s (default is 450).\n"
-"  -o|--output <file>               For -j (default is <package>-<version>.deb).\n"
+"  -o|--output <file>               For -j (default is <package>-<version>."
+"deb).\n"
 "  -Q|--npquiet                     Be quiet when -a is not a part.\n"
 "  --msdos                          Generate 8.3 filenames.\n"
 "\n"
@@ -4024,7 +4170,8 @@ msgstr ""
 "Opties:\n"
 "    --depotdir <map>             (standaard is %s/%s)\n"
 "    -S|--partsize <grootte>      (in Kb, voor -s is standaard 450)\n"
-"    -o|--output <bestand>        (voor -j is standaard <pakket>-<versie>.deb)\n"
+"    -o|--output <bestand>        (voor -j is standaard <pakket>-<versie>."
+"deb)\n"
 "    -Q|--npquiet                 (stil als -a niet een deel is)\n"
 "    --msdos                      (genereer 8.3 bestandsnamen)\n"
 "\n"
@@ -4123,8 +4270,7 @@ msgstr "--listq verwacht geen argumenten"
 msgid "Junk files left around in the depot directory:\n"
 msgstr "Rommel achtergelaten in de depotmap:\n"
 
-#: dpkg-split/queue.c:202
-#: dpkg-split/queue.c:226
+#: dpkg-split/queue.c:202 dpkg-split/queue.c:226
 #, c-format
 msgid "unable to stat `%.250s'"
 msgstr "kan `%.250s' niet opvragen"
@@ -4189,10 +4335,8 @@ msgstr "bronbestand `%.250s' is geen gewoon bestand"
 msgid "unable to exec mksplit"
 msgstr "kan mksplit niet uitvoeren"
 
-#: scripts/cleanup-info.pl:36
-#: scripts/dpkg-divert.pl:19
-#: scripts/dpkg-statoverride.pl:29
-#: scripts/install-info.pl:17
+#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
+#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
 #: scripts/update-alternatives.pl:64
 #, perl-format
 msgid "Debian %s version %s.\n"
@@ -4206,10 +4350,8 @@ msgstr ""
 "\n"
 "Copyright (C) 996 Kim-Minh Kaplan"
 
-#: scripts/cleanup-info.pl:41
-#: scripts/dpkg-divert.pl:25
-#: scripts/dpkg-statoverride.pl:34
-#: scripts/install-info.pl:22
+#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
+#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
 #: scripts/update-alternatives.pl:70
 msgid ""
 "\n"
@@ -4239,26 +4381,22 @@ msgstr ""
 "  --help        toon deze helpboodschap.\n"
 "  --version   toon de versie.\n"
 
-#: scripts/cleanup-info.pl:66
-#: scripts/install-info.pl:508
+#: scripts/cleanup-info.pl:66 scripts/install-info.pl:508
 #, perl-format
 msgid "%s: warning - unable to unlock %s: %s"
 msgstr "%s: waarschuwing - kan %s niet ontgrendelen: %s"
 
-#: scripts/cleanup-info.pl:86
-#: scripts/install-info.pl:119
+#: scripts/cleanup-info.pl:86 scripts/install-info.pl:119
 #, perl-format
 msgid "%s: unknown option `%s'"
 msgstr "%s: onbekende optie '%s'"
 
-#: scripts/cleanup-info.pl:94
-#: scripts/install-info.pl:130
+#: scripts/cleanup-info.pl:94 scripts/install-info.pl:130
 #, perl-format
 msgid "%s: too many arguments"
 msgstr "%s: teveel argumenten"
 
-#: scripts/cleanup-info.pl:101
-#: scripts/install-info.pl:305
+#: scripts/cleanup-info.pl:101 scripts/install-info.pl:305
 #, perl-format
 msgid "%s: failed to lock dir for editing! %s"
 msgstr "%s: map vergrendelen voor aanpassen is mislukt! %s"
@@ -4268,48 +4406,40 @@ msgstr "%s: map vergrendelen voor aanpassen is mislukt! %s"
 msgid "try deleting %s"
 msgstr "probeer %s te verwijderen"
 
-#: scripts/cleanup-info.pl:107
-#: scripts/install-info.pl:312
+#: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
 #: scripts/update-alternatives.pl:167
 #, perl-format
 msgid "unable to open %s: %s"
 msgstr "kan %s niet openen: %s"
 
-#: scripts/cleanup-info.pl:109
-#: scripts/install-info.pl:482
+#: scripts/cleanup-info.pl:109 scripts/install-info.pl:482
 #, perl-format
 msgid "unable to create %s: %s"
 msgstr "kan %s niet aanmaken: %s"
 
-#: scripts/cleanup-info.pl:120
-#: scripts/install-info.pl:485
+#: scripts/cleanup-info.pl:120 scripts/install-info.pl:485
 #, perl-format
 msgid "unable to write %s: %s"
 msgstr "kan %s niet verwijderen: %s"
 
-#: scripts/cleanup-info.pl:160
-#: scripts/install-info.pl:165
-#: scripts/install-info.pl:207
-#: scripts/install-info.pl:314
+#: scripts/cleanup-info.pl:160 scripts/install-info.pl:165
+#: scripts/install-info.pl:207 scripts/install-info.pl:314
 #, perl-format
 msgid "unable to read %s: %s"
 msgstr "kan %s niet lezen: %s"
 
-#: scripts/cleanup-info.pl:161
-#: scripts/install-info.pl:315
+#: scripts/cleanup-info.pl:161 scripts/install-info.pl:315
 #, perl-format
 msgid "unable to close %s after read: %s"
 msgstr "kan %s niet sluiten na lezen: %s"
 
-#: scripts/cleanup-info.pl:165
-#: scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "kan %s niet sluiten: %s"
 
-#: scripts/cleanup-info.pl:171
-#: scripts/install-info.pl:490
+#: scripts/cleanup-info.pl:171 scripts/install-info.pl:490
 #, perl-format
 msgid "unable to backup old %s, giving up: %s"
 msgstr "kan geen reservekopie maken van oude %s, dit wordt opgegeven: %s"
@@ -4324,8 +4454,7 @@ msgstr "installeren van %s is mislukt: het wordt gelaten als %s: %s"
 msgid "%s: unable to unlock %s: %s"
 msgstr "%s: ontgrendelen van %s is mislukt: %s"
 
-#: scripts/dpkg-divert.pl:15
-#: scripts/update-alternatives.pl:60
+#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr "Kan geen ENOENT-waarde krijgen van %s: %s"
@@ -4352,7 +4481,8 @@ msgid ""
 "  --truename <file>        return the diverted file.\n"
 "\n"
 "Options:\n"
-"  --package <package>      name of the package whose copy of <file> will not\n"
+"  --package <package>      name of the package whose copy of <file> will "
+"not\n"
 "                             be diverted.\n"
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
@@ -4365,7 +4495,8 @@ msgid ""
 "\n"
 "When adding, default is --local and --divert <original>.distrib.\n"
 "When removing, --package or --local and --divert must match if specified.\n"
-"Package preinst/postrm scripts should always specify --package and --divert.\n"
+"Package preinst/postrm scripts should always specify --package and --"
+"divert.\n"
 msgstr ""
 "Gebruik: %s [<optie> ...] <commando>\n"
 "\n"
@@ -4378,7 +4509,8 @@ msgstr ""
 "Opties:\n"
 "  --package <pakket>  naam van het pakket wiens kopie van <bestand niet\n"
 "                                     omgeleid zal wordt.\n"
-"  --local                         alle versies uit pakketten worden omgeleid.\n"
+"  --local                         alle versies uit pakketten worden "
+"omgeleid.\n"
 "  --divert <omleiden-naar> de naam die door versies in andere pakketten \n"
 "                                            gebruikt wordt.\n"
 "  --rename                   plaats het bestand aan de kant (of terug).\n"
@@ -4388,15 +4520,18 @@ msgstr ""
 "  --help                       toon deze helpboodschap.\n"
 "  --version                  toon de versie.\n"
 "\n"
-"Tijdens toevoegen is de standaardwaarde --local en --divert <origineel> distrib.\n"
-"Tijdens verwijderen moeten --package of --local en --divert overeenkomen indien\n"
+"Tijdens toevoegen is de standaardwaarde --local en --divert <origineel> "
+"distrib.\n"
+"Tijdens verwijderen moeten --package of --local en --divert overeenkomen "
+"indien\n"
 "opgegeven.\n"
-"Pakket preinst/postrm-scripts dienen altijd --package en--divert op te geven.\n"
+"Pakket preinst/postrm-scripts dienen altijd --package en--divert op te "
+"geven.\n"
 
-#: scripts/dpkg-divert.pl:78
-#: scripts/update-alternatives.pl:223
-#, perl-format
-msgid "two modes specified: %s and --%s"
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
+#, fuzzy, perl-format
+msgid "two commands specified: %s and --%s"
 msgstr "twee modes opgegeven: %s en --%s"
 
 #: scripts/dpkg-divert.pl:111
@@ -4417,17 +4552,14 @@ msgstr "--%s heeft een pakketnaam als argument nodig"
 msgid "package may not contain newlines"
 msgstr "pakketnaam mag geen regeleinden bevatten"
 
-#: scripts/dpkg-divert.pl:119
-#: scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272
-#: scripts/update-alternatives.pl:275
+#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s heeft een map als argument nodig"
 
-#: scripts/dpkg-divert.pl:122
-#: scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
+#: scripts/update-alternatives.pl:290
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "onbekende optie '%s'"
@@ -4445,22 +4577,18 @@ msgstr "ontbrekende altname"
 msgid "missing package"
 msgstr "ontbrekende pakketnaam"
 
-#: scripts/dpkg-divert.pl:139
-#: scripts/dpkg-divert.pl:167
-#: scripts/dpkg-divert.pl:210
-#: scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
+#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
 #, perl-format
 msgid "--%s needs a single argument"
 msgstr "--%s heeft een enkel argument nodig"
 
-#: scripts/dpkg-divert.pl:141
-#: scripts/dpkg-divert.pl:145
+#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
 #, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr "bestandsnaam '%s' is niet absoluut"
 
-#: scripts/dpkg-divert.pl:142
-#: scripts/dpkg-statoverride.pl:130
+#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
 msgid "file may not contain newlines"
 msgstr "bestand mag geen regeleinden bevatten"
 
@@ -4584,8 +4712,7 @@ msgstr "nieuwe diversions-new aanmaken: %s"
 msgid "install new diversions: %s"
 msgstr "nieuwe omleidingen installeren: %s"
 
-#: scripts/dpkg-divert.pl:310
-#: scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "interne fout: %s is corrupt: %s"
@@ -4621,14 +4748,17 @@ msgstr ""
 "\n"
 "C+ommando's:\n"
 "  --add <eigenaar> <groep> <modus> <bestand>\n"
-"                                        voeg een nieuwe ingang toe aan de database.\n"
+"                                        voeg een nieuwe ingang toe aan de "
+"database.\n"
 "  --remove <bestand>    verwijder bestand uit de database.\n"
-"  --list [<glob-patroon>]  toon de overstijgingen die momenteel in de database zitten.\n"
+"  --list [<glob-patroon>]  toon de overstijgingen die momenteel in de "
+"database zitten.\n"
 "\n"
 "Opties:\n"
 "  --admindir <map> stel de map met het 'statoverride'-bestand in.\n"
 "  --update                 bestandsrechten onmiddellijk bijwerken.\n"
-"  --force                     actie afdwingen zelfs als de gezondheid-check mislukt.\n"
+"  --force                     actie afdwingen zelfs als de gezondheid-check "
+"mislukt.\n"
 "  --quiet                     stille operatie, minimale uitvoer.\n"
 "  --help                      toon deze helpboodschap.\n"
 "  --version                 toon de versie.\n"
@@ -4666,8 +4796,7 @@ msgstr "niet-bestaande groep %s"
 msgid "illegal mode %s"
 msgstr "illegale modus %s"
 
-#: scripts/dpkg-statoverride.pl:131
-#: scripts/dpkg-statoverride.pl:158
+#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
 #: scripts/dpkg-statoverride.pl:177
 msgid "stripping trailing /"
 msgstr "/ op einde wordt weggehaald"
@@ -4754,15 +4883,18 @@ msgid ""
 "Options:\n"
 "  --section <regexp> <title>\n"
 "                           put the new entry in the <regex> matched section\n"
-"                           or create a new one with <title> if non-existent.\n"
+"                           or create a new one with <title> if non-"
+"existent.\n"
 "  --menuentry=<text>       set the menu entry.\n"
-"  --description=<text>     set the description to be used in the menu entry.\n"
+"  --description=<text>     set the description to be used in the menu "
+"entry.\n"
 "  --info-file=<path>       specify info file to install in the directory.\n"
 "  --dir-file=<path>        specify file name of info directory file.\n"
 "  --infodir=<directory>    same as '--dir-file=<directory>/dir'.\n"
 "  --info-dir=<directory>   likewise.\n"
 "  --keep-old               do not replace entries nor remove empty ones.\n"
-"  --remove                 remove the entry specified by <filename> basename.\n"
+"  --remove                 remove the entry specified by <filename> "
+"basename.\n"
 "  --remove-exactly         remove the exact <filename> entry.\n"
 "  --test                   enables test mode (no actions taken).\n"
 "  --debug                  enables debug mode (show more information).\n"
@@ -4774,19 +4906,28 @@ msgstr ""
 "\n"
 "Opties:\n"
 "  --section <regexp> <titel>\n"
-"                           zet de nieuwe ingang in de met <regex> overeenkomende sectie\n"
-"                           of maak een nieuwe aan met <titel> indien onbestaand.\n"
+"                           zet de nieuwe ingang in de met <regex> "
+"overeenkomende sectie\n"
+"                           of maak een nieuwe aan met <titel> indien "
+"onbestaand.\n"
 "  --menuentry=<tekst> stel de menu-ingang in.\n"
-"  --description=<tekst> stel de beschrijving te gebruiken in de menu-ingang in.\n"
-"  --info-file=<pad>         geef het in de map te installeren 'info'-bestand op.\n"
-"  --dir-file=<pad>           geef de bestandsnaam van het 'info map' bestand op.\n"
+"  --description=<tekst> stel de beschrijving te gebruiken in de menu-ingang "
+"in.\n"
+"  --info-file=<pad>         geef het in de map te installeren 'info'-bestand "
+"op.\n"
+"  --dir-file=<pad>           geef de bestandsnaam van het 'info map' bestand "
+"op.\n"
 "  --infodir=<map>          zoals '--dir-file=<map>/dir'.\n"
 "  --info-dir=<map>         idem.\n"
-"  --keep-old                      overschrijf geen ingangen, en verwijder geen lege.\n"
-"  --remove                       verwijder de door <bestandsnaam> basisnaam opgegeven ingang.\n"
+"  --keep-old                      overschrijf geen ingangen, en verwijder "
+"geen lege.\n"
+"  --remove                       verwijder de door <bestandsnaam> basisnaam "
+"opgegeven ingang.\n"
 "  --remove-exactly           verwijder de exacte <bestandsnaam> ingang.\n"
-"  --test                             activeert de test-modus (er worden geen acties uitgevoerd).\n"
-"  --debug                         activeert de debug-modus (toont meer informatie).\n"
+"  --test                             activeert de test-modus (er worden geen "
+"acties uitgevoerd).\n"
+"  --debug                         activeert de debug-modus (toont meer "
+"informatie).\n"
 "  --quiet                           toon geen boodchappen.\n"
 "  --help                            toon deze helpboodschap.\n"
 "  --version                       toon de versie.\n"
@@ -4824,7 +4965,8 @@ msgstr "%s: test modus - dir-bestand wordt niet bijgewerkt"
 #: scripts/install-info.pl:191
 #, perl-format
 msgid "%s: warning, ignoring confusing INFO-DIR-ENTRY in file."
-msgstr "%s: waarschuwing, verwarrende INFO-DIR-ENTRY in bestand wordt genegeerd."
+msgstr ""
+"%s: waarschuwing, verwarrende INFO-DIR-ENTRY in bestand wordt genegeerd."
 
 #: scripts/install-info.pl:200
 msgid "invalid info entry"
@@ -4839,15 +4981,15 @@ msgid ""
 msgstr ""
 "\n"
 "Er is geen 'START-INFO-DIR-ENTRY' en geen 'This file documents'.\n"
-"%s: kan geen beschrijving voor 'dir'-ingang bepalen - poging wordt opgegeven\n"
+"%s: kan geen beschrijving voor 'dir'-ingang bepalen - poging wordt "
+"opgegeven\n"
 
 #: scripts/install-info.pl:279
 #, perl-format
 msgid "%s: no file %s, retrieving backup file %s."
 msgstr "%s: geen bestand %s, reservekopie %s wordt opgehaald"
 
-#: scripts/install-info.pl:282
-#: scripts/install-info.pl:292
+#: scripts/install-info.pl:282 scripts/install-info.pl:292
 #, perl-format
 msgid "%s: copying %s to %s failed, giving up: %s"
 msgstr "%s: kopiëren van %s naar %s is mislukt, poging wordt opgegeven: %s"
@@ -4890,12 +5032,15 @@ msgstr "%s: nieuwe sectie '%s' wordt aangemaakt"
 #: scripts/install-info.pl:367
 #, perl-format
 msgid "%s: no sections yet, creating Miscellaneous section too."
-msgstr "%s: er zijn nog geen secties, 'Miscellaneous'-sectie wordt ook aangemaakt."
+msgstr ""
+"%s: er zijn nog geen secties, 'Miscellaneous'-sectie wordt ook aangemaakt."
 
 #: scripts/install-info.pl:385
 #, perl-format
 msgid "%s: no section specified for new entry, placing at end"
-msgstr "%s: er is geen sectie opgegeven voor de nieuwe ingang, wordt aan het einde geplaatst"
+msgstr ""
+"%s: er is geen sectie opgegeven voor de nieuwe ingang, wordt aan het einde "
+"geplaatst"
 
 #: scripts/install-info.pl:422
 #, perl-format
@@ -4967,11 +5112,13 @@ msgid ""
 "    [--slave <link> <name> <path>] ...\n"
 "                           add a group of alternatives to the system.\n"
 "  --remove <name> <path>   remove <path> from the <name> group alternative.\n"
-"  --remove-all <name>      remove <name> group from the alternatives system.\n"
+"  --remove-all <name>      remove <name> group from the alternatives "
+"system.\n"
 "  --auto <name>            switch the master link <name> to automatic mode.\n"
 "  --display <name>         display information about the <name> group.\n"
 "  --list <name>            display all targets of the <name> group.\n"
-"  --config <name>          show alternatives for the <name> group and ask the\n"
+"  --config <name>          show alternatives for the <name> group and ask "
+"the\n"
 "                           user to select which one to use.\n"
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
@@ -4982,7 +5129,8 @@ msgid ""
 "  (e.g. pager)\n"
 "<path> is the location of one of the alternative target files.\n"
 "  (e.g. /usr/bin/less)\n"
-"<priority> is an integer; options with higher numbers have higher priority in\n"
+"<priority> is an integer; options with higher numbers have higher priority "
+"in\n"
 "  automatic mode.\n"
 "\n"
 "Options:\n"
@@ -4999,16 +5147,24 @@ msgstr ""
 "Commando's:\n"
 "  --install <link> <naam> <pad> <prioriteit>\n"
 "    [--slave <link> <naam> <pad>] ...\n"
-"                           voegt een groep van alternatieven toe aan het systeem.\n"
-"  --remove <naam> <pad> verwijderd <pad> van de groep alternatieven genaamd <naam>.\n"
-"  --remove-all <naam>        verwijderd <naam>-groep van het alternatieven-systeem.\n"
-"  --auto <naam>                  zet de hoofdlink <naam> om naar automatische modus.\n"
+"                           voegt een groep van alternatieven toe aan het "
+"systeem.\n"
+"  --remove <naam> <pad> verwijderd <pad> van de groep alternatieven genaamd "
+"<naam>.\n"
+"  --remove-all <naam>        verwijderd <naam>-groep van het alternatieven-"
+"systeem.\n"
+"  --auto <naam>                  zet de hoofdlink <naam> om naar "
+"automatische modus.\n"
 "  --display <naam>              toont informatie over de <naam>-groep.\n"
-"  --list <naam>                     toont informatie over alle doelen in de <naam>-groep.\n"
-"  --config <naam>               toont alle alternatieven voor de <naam>-groep en vraagt de \n"
-"                                               gebruiker welke te gebruiken.\n"
+"  --list <naam>                     toont informatie over alle doelen in de "
+"<naam>-groep.\n"
+"  --config <naam>               toont alle alternatieven voor de <naam>-"
+"groep en vraagt de \n"
+"                                               gebruiker welke te "
+"gebruiken.\n"
 "  --set <naam> <pad>       stelt <pad> in als alternatief voor <naam>.\n"
-"  --all                                       roept --config aan voor alle alternatieven.\n"
+"  --all                                       roept --config aan voor alle "
+"alternatieven.\n"
 "\n"
 "<link> is de link die verwijst naar %s/<naam>\n"
 "  (vb. /usr/bin/pager).\n"
@@ -5029,8 +5185,8 @@ msgstr ""
 "  --version                  toon de versie.\n"
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
-msgstr "manflag"
+msgid "invalid update mode"
+msgstr ""
 
 #: scripts/update-alternatives.pl:135
 #, perl-format
@@ -5059,129 +5215,131 @@ msgstr "prioriteit %s %s"
 
 #: scripts/update-alternatives.pl:156
 #, perl-format
-msgid "Alternative for %s points to %s - which wasn't found.  Removing from list of alternatives."
-msgstr "Alternatief voor %s verwijst naar %s - wat niet gevonden is, Wordt verwijderd van lijst van alternatieven."
+msgid ""
+"Alternative for %s points to %s - which wasn't found.  Removing from list of "
+"alternatives."
+msgstr ""
+"Alternatief voor %s verwijst naar %s - wat niet gevonden is, Wordt "
+"verwijderd van lijst van alternatieven."
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - status is %s."
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr "link verwijst momenteel naar %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr "link is momenteel afwezig"
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr "link is onleesbaar - %s"
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - prioriteit %s"
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr "slaaf %s: %s"
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 msgid "No versions available."
 msgstr "Geen versies beschikbaar"
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "Huidge 'beste' versie is %s."
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "onbekend argument '%s'"
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install heeft <link> <name> <path> <priority> nodig"
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr "prioriteit moet een integer getal zijn"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s heeft <naam> <pad> nodig"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s heeft <naam> nodig"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave heeft <link> <name> <path> nodig"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "slaaf-naam %s is gedupliceerd"
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "slaaf-link %s is gedupliceerd"
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "de naam %s is zowel hoofd als slaaf"
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "de links %s is zowel hoofd als slaaf"
 
-#: scripts/update-alternatives.pl:289
-msgid "need --display, --config, --set, --install, --remove, --all, --remove-all or --auto"
-msgstr "--display, --config, --set, --install, --remove, --all, --remove-all of --auto is nodig"
+#: scripts/update-alternatives.pl:300
+msgid ""
+"need --display, --config, --set, --install, --remove, --all, --remove-all or "
+"--auto"
+msgstr ""
+"--display, --config, --set, --install, --remove, --all, --remove-all of --"
+"auto is nodig"
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr "--slave is enkel toegelaten met --install"
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Er zijn geen alternatieven voor %s"
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Automatische selectie van %s wordt opgezet."
 
-#: scripts/update-alternatives.pl:353
-#: scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467
-#: scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532
-#: scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536
-#: scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599
-#: scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674
-#: scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "verwijderen van %s is mislukt: %s"
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5190,128 +5348,125 @@ msgstr ""
 "%s is veranderd (handmatig of door een script).\n"
 "Er wordt omgeschakeld naar enkel handmatige updates."
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
 "(You may modify the symlinks there yourself if desired - see `man ln'.)"
 msgstr ""
-"Beschikbare versies van %s worden nagekeken, links in %s worden bijgewerkt ...\n"
+"Beschikbare versies van %s worden nagekeken, links in %s worden "
+"bijgewerkt ...\n"
 "(U kunt de symbolische koppelingen desgewenst zelf wijzigen - zie 'man ln'.)"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "%s-link wordt hernoemt van %s naar %s."
 
-#: scripts/update-alternatives.pl:387
-#: scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493
-#: scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "kan %s niet hernoemen naar %s: %s"
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "slaaf-linknaam %s is dubbel"
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "Slaaf-link %s wordt hernoemt van %s naar %s."
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
-msgstr "Handmatig geselecteerd alternatief wordt verwijderd - wordt omgeschakeld naar automatische modus"
+msgstr ""
+"Handmatig geselecteerd alternatief wordt verwijderd - wordt omgeschakeld "
+"naar automatische modus"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "Alternatief %s voor %s is niet geregistreerd, wordt niet verwijderd."
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Verouderde slaaf-link %s wordt weggegooid (%s)."
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
-msgstr "Automatische opwaarderingen van %s zijn uitgeschakeld, het wordt met rust gelaten."
+msgstr ""
+"Automatische opwaarderingen van %s zijn uitgeschakeld, het wordt met rust "
+"gelaten."
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
-msgstr "Om automatische opwaarderingen terug in te schakelen kunt 'update-alternatives --auto %s' gebruiken."
+msgstr ""
+"Om automatische opwaarderingen terug in te schakelen kunt 'update-"
+"alternatives --auto %s' gebruiken."
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Er wordt herstelt van de vorige mislukte opwaardering van %s ..."
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "kan %s niet openen voor schrijven: %s"
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
-msgstr "Laatste pakket dat voorzag in %s (%s) is verwijderd, dit wordt verwijderd. "
+msgstr ""
+"Laatste pakket dat voorzag in %s (%s) is verwijderd, dit wordt verwijderd. "
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
 " (or nonexistent); however, readlink failed: %s"
 msgstr ""
-"waarschuwing: %s wordt verondersteld een symbolische koppeling naar %s te zijn\n"
+"waarschuwing: %s wordt verondersteld een symbolische koppeling naar %s te "
+"zijn\n"
 " (of onbestaand); echter readlink is mislukt: %s"
 
-#: scripts/update-alternatives.pl:549
-#: scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586
-#: scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "kan niet verzekeren dat %s niet bestaat: %s"
 
-#: scripts/update-alternatives.pl:551
-#: scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611
-#: scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696
-#: scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "kan van %s geen symbolische koppeling naar %s maken: %s"
 
-#: scripts/update-alternatives.pl:553
-#: scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590
-#: scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662
-#: scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "kan %s niet installeren als %s: %s"
 
-#: scripts/update-alternatives.pl:556
-#: scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "%s (%s) laten we zoals is, verwijzend naar %s."
 
-#: scripts/update-alternatives.pl:559
-#: scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "%s (%s) wordt bijgewerkt om naar %s te verwijzen."
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5320,14 +5475,13 @@ msgstr ""
 "waarschuwing: %s wordt verondersteld een slaaf-link te zijn voor\n"
 " %s, of onbestaand; echter readlink is mislukt: %s"
 
-#: scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "%s (%s) wordt verwijdert, niet toepasselijk met %s."
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5336,7 +5490,7 @@ msgstr ""
 "Er is geen programma dat %s voorziet\n"
 "Er is niets in te stellen.\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5345,7 +5499,7 @@ msgstr ""
 "Er is slechts 1 programma dat %s voorziet\n"
 "(%s). Er is niets in te stellen.\n"
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5358,51 +5512,59 @@ msgstr ""
 "  Selectie    Alternatieven\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
-msgstr "druk enter om de standaardwaarde [*] te behouden, of  geef het selectienumber in: "
+msgstr ""
+"druk enter om de standaardwaarde [*] te behouden, of  geef het "
+"selectienumber in: "
 
-#: scripts/update-alternatives.pl:657
-#: scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "'%s' wordt gebruikt om in '%s' te voorzien."
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Kan geen alternatief '%s' vinden."
 
-#: scripts/update-alternatives.pl:715
-#: scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "fout bij schrijven naar stdout: %s"
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
-msgstr "regeleinden zijn niet toegelaten in 'update-alternatives'-bestanden (%s)"
+msgstr ""
+"regeleinden zijn niet toegelaten in 'update-alternatives'-bestanden (%s)"
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "fout of eof bij lezen van %s voor %s (%s)"
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, perl-format
 msgid "missing newline after %s"
 msgstr "missend regeleinde na %s"
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Ernstig probleem: %s"
 
+#~ msgid "two modes specified: %s and --%s"
+#~ msgstr "twee modes opgegeven: %s en --%s"
+
+#~ msgid "manflag"
+#~ msgstr "manflag"
+
 #~ msgid "%s: failed to exec gzip -dc"
 #~ msgstr "%s: uitvoeren van 'gzip -dc' is mislukt"
+
 #~ msgid "%s: failed to exec bzip2 -dc"
 #~ msgstr "%s: uitvoeren van  'bzip2 -dc' is mislukt"
+
 #~ msgid "%s: failed to exec bzip2 %s"
 #~ msgstr "%s: uitvoeren van bzip2 %s is mislukt"
-
diff --git a/po/nn.po b/po/nn.po
index cbc9efa7..0934d19b 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: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+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"
@@ -4294,7 +4294,7 @@ msgid "unable to close %s after read: %s"
 msgstr "klarte ikkje lukka etter lesing: «%.255s»"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, fuzzy, perl-format
 msgid "unable to close %s: %s"
 msgstr "klarte ikkje køyra %s"
@@ -4356,9 +4356,10 @@ msgid ""
 "divert.\n"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
 #, perl-format
-msgid "two modes specified: %s and --%s"
+msgid "two commands specified: %s and --%s"
 msgstr ""
 
 #: scripts/dpkg-divert.pl:111
@@ -4381,13 +4382,13 @@ msgid "package may not contain newlines"
 msgstr "Pakken «%s» inneheld ingen filer (!)\n"
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, fuzzy, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--build krev ein katalogparameter"
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, fuzzy, perl-format
 msgid "unknown option `%s'"
 msgstr "ukjent val --%s"
@@ -4536,7 +4537,7 @@ msgstr "lesefeil i omdirigeringsfila [i]"
 msgid "install new diversions: %s"
 msgstr "klarte ikkje installera ny versjon av «%.255s»"
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, fuzzy, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "%s: Intern gzip-feil: Skreiv: «%s»"
@@ -4908,7 +4909,7 @@ msgid ""
 msgstr ""
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
+msgid "invalid update mode"
 msgstr ""
 
 #: scripts/update-alternatives.pl:135
@@ -4943,262 +4944,262 @@ msgid ""
 "alternatives."
 msgstr ""
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr ""
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 #, fuzzy
 msgid "No versions available."
 msgstr "(inga skildring tilgjengeleg)"
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, fuzzy, perl-format
 msgid "unknown argument `%s'"
 msgstr "ukjend komprimeringstype «%s»!"
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr ""
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, fuzzy, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s krev eit .deb-filnamn som parameter"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, fuzzy, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s tek ingen parametrar"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
 msgstr ""
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr ""
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, fuzzy, perl-format
 msgid "unable to remove %s: %s"
 msgstr "klarte ikkje køyra %s"
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
 "Switching to manual updates only."
 msgstr ""
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
 "(You may modify the symlinks there yourself if desired - see `man ln'.)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, fuzzy, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Pakkar ut %s (frå %s) ...\n"
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, fuzzy, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "finn ikkje %s «%.250s»"
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr ""
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr ""
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr ""
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, fuzzy, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "klarte ikkje opna kjeldefila «%.250s»"
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr ""
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
 " (or nonexistent); however, readlink failed: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, fuzzy, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "klarte ikkje køyra nytt %s"
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, fuzzy, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "klarte ikkje laga sikringskopi av den symbolske lenkja «%.255s»"
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, fuzzy, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "klarte ikkje installera «%.250s» som «%.250s»"
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
 " %s, or nonexistent; however, readlink failed: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
 "Nothing to configure.\n"
 msgstr "  %.250s tilbyr %.250s, men oppsettet skal fjernast.\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
 "(%s). Nothing to configure.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5207,41 +5208,41 @@ msgid ""
 "-----------------------------------------------\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, fuzzy, perl-format
 msgid "error writing stdout: %s"
 msgstr "feil ved skriving av «%s»"
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, fuzzy, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "klarte ikkje lesa %s frå %.255s"
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, fuzzy, perl-format
 msgid "missing newline after %s"
 msgstr "fila «%.250s» er øydelagd - manglar linjeskift etter %.250s"
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr ""
diff --git a/po/pa.po b/po/pa.po
index 174cbf60..157e39da 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pa\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+0300\n"
 "PO-Revision-Date: 2006-12-25 08:23+0530\n"
 "Last-Translator: A S Alam <apbrar@gmail.com>\n"
 "Language-Team: Punjabi <fedora-trans-pa@redhat.com>\n"
@@ -4155,7 +4155,7 @@ msgid "unable to close %s after read: %s"
 msgstr ""
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr ""
@@ -4245,9 +4245,10 @@ msgstr ""
 "Package preinst/postrm scripts should always specify --package and --"
 "divert.\n"
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
 #, perl-format
-msgid "two modes specified: %s and --%s"
+msgid "two commands specified: %s and --%s"
 msgstr ""
 
 #: scripts/dpkg-divert.pl:111
@@ -4269,13 +4270,13 @@ msgid "package may not contain newlines"
 msgstr ""
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr ""
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "ਅਣਜਾਣ ਚੋਣ `%s'"
@@ -4420,7 +4421,7 @@ msgstr ""
 msgid "install new diversions: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "ਅੰਦਰੂਨੀ ਗਲਤੀ: %s ਨਿਕਾਰਾ: %s"
@@ -4871,8 +4872,8 @@ msgstr ""
 "  --version                show the version.\n"
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
-msgstr "manflag"
+msgid "invalid update mode"
+msgstr ""
 
 #: scripts/update-alternatives.pl:135
 #, perl-format
@@ -4906,92 +4907,92 @@ msgid ""
 "alternatives."
 msgstr ""
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - ਹਾਲਤ %s ਹੈ।"
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr " ਸਬੰਧ %s ਨੂੰ ਇਸ਼ਾਰਾ ਕਰਦਾ ਹੈ"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr " ਸਬੰਧ ਇਸ ਸਮੇਂ ਮੌਜੂਦ ਨਹੀਂ"
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " ਸਬੰਧ ਪੜ੍ਹਨਯੋਗ ਨਹੀਂ - %s"
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - ਤਰਜੀਹ %s"
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr " ਸਲੇਵ %s: %s"
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 msgid "No versions available."
 msgstr "ਕੋਈ ਵਰਜਨ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "%s ਦਾ ਮੌਜੂਦਾ`best' ਵਰਜਨ ਹੈ।"
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "ਲਾਜ਼ਮੀ ਮੁੱਲ `%s'"
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install needs <link> <name> <path> <priority>"
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr "ਤਰਜੀਹ ਇੱਕ ਪੂਰਨ ਅੰਕ ਹੀ ਚਾਹੀਦਾ ਹੈ"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s needs <name> <path>"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s needs <name>"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave needs <link> <name> <path>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -4999,170 +5000,170 @@ msgstr ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr "--slave only allowed with --install"
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "%s ਲਈ ਕੋਈ ਬਦਲ ਨਹੀਂ ਹੈ।"
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "%s ਲਈ ਆਟੋਮੈਟਿਕ ਚੋਣ ਸੈਟਅੱਪ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "%s ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ: %s"
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
 "Switching to manual updates only."
 msgstr ""
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
 "(You may modify the symlinks there yourself if desired - see `man ln'.)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr ""
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "%s ਲਈ ਆਟੋਮੈਟਿਕ ਅੱਪਡੇਟ ਆਯੋਗ ਹੈ, ਇਸ ਨੂੰ ਇੱਕਲਾ ਛੱਡਿਆ ਜਾਂਦਾ ਹੈ"
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr ""
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr ""
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
 " (or nonexistent); however, readlink failed: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
 " %s, or nonexistent; however, readlink failed: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, perl-format
 msgid ""
 "There is no program which provides %s.\n"
 "Nothing to configure.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
 "(%s). Nothing to configure.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5171,41 +5172,44 @@ msgid ""
 "-----------------------------------------------\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, perl-format
 msgid "missing newline after %s"
 msgstr "ਨਵੀਂ-ਲਾਇਨ %s ਬਾਅਦ ਮੌਜੂਦ ਨਹੀਂ"
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "ਗੰਭੀਰ ਸਮੱਸਿਆ: %s"
+
+#~ msgid "manflag"
+#~ msgstr "manflag"
diff --git a/po/pl.po b/po/pl.po
index c741fa90..0c316ba4 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+0300\n"
 "PO-Revision-Date: 2007-05-04 22:48+0200\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <pddp@debian.linux.org.pl>\n"
@@ -4439,7 +4439,7 @@ msgid "unable to close %s after read: %s"
 msgstr "nie mo¿na zamkn±æ %s po czytaniu: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "nie mo¿na zamkn±æ %s: %s"
@@ -4529,9 +4529,10 @@ msgstr ""
 "podano.\n"
 "Skrypty przed/poinstalacyjne musz± zawsze podawaæ --package i --divert.\n"
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
-#, perl-format
-msgid "two modes specified: %s and --%s"
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
+#, fuzzy, perl-format
+msgid "two commands specified: %s and --%s"
 msgstr "podano dwa tryby: %s i --%s"
 
 #: scripts/dpkg-divert.pl:111
@@ -4553,13 +4554,13 @@ msgid "package may not contain newlines"
 msgstr "pakiet nie mo¿e zawieraæ znaków nowej linii"
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s wymaga argumentu <katalog>"
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "nieznana opcja `%s'"
@@ -4712,7 +4713,7 @@ msgstr "czytanie nowego pliku diversions-old: %s"
 msgid "install new diversions: %s"
 msgstr "instalowanie nowej listy ominiêæ: %s"
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "b³±d wewnêtrzny: uszkodzone %s: %s"
@@ -5164,8 +5165,8 @@ msgstr ""
 "  --version                wy¶wietla informacje o wersji.\n"
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
-msgstr "manflag"
+msgid "invalid update mode"
+msgstr ""
 
 #: scripts/update-alternatives.pl:135
 #, perl-format
@@ -5201,92 +5202,92 @@ msgstr ""
 "Alternatywa dla %s wskazuje na %s, który nie zosta³ znaleziony. Usuwanie jej "
 "z listy alternatyw."
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - status jest %s."
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr " link obecnie wskazuje na %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr " obecnie brak dowi±zania"
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " nie mo¿na odczytaæ dowi±zania - %s"
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - priorytet %s"
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr " dowi±zanie podrzêdne %s: %s"
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 msgid "No versions available."
 msgstr "¯adna wersja nie jest dostêpna."
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "Obecnie `najlepsz±' wersj± jest %s."
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "nieznany argument `%s'"
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install wymaga podania <linku> <nazwy> <¶cie¿ki> <priorytetu>"
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr "priorytet musi byæ liczb±"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s wymaga argumentów <nazwa> <¶cie¿ka>"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s wymaga <nazwy>"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave wymaga <linku> <nazwy> <¶cie¿ki>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "podwojona nazwa podrzêdna %s"
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "podwojone dowi±zanie podrzêdne %s"
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "nazwa %s jest zarówno g³ówna, jak i podrzêdna"
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "dowi±zanie %s jest zarówno g³ówne, jak i podrzêdne"
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5294,31 +5295,31 @@ msgstr ""
 "nale¿y podaæ --display, --config, --set, --install, --remove, --all, --"
 "remove-all lub --auto"
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr "--slave dopuszczalna tylko z --install"
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Brak alternatyw dla %s."
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Ustawianie automatycznego wybierania %s"
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "nie mo¿na usun±æ %s: %s"
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5327,7 +5328,7 @@ msgstr ""
 "%s zosta³ zmieniony (rêcznie lub przez skrypt).\n"
 "Prze³±czanie do trybu rêcznych aktualizacji."
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5337,69 +5338,69 @@ msgstr ""
 "(Mo¿esz zmieniæ dowi±zania symboliczne samemu, je¶li chcesz - patrz `man "
 "ln')."
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Zmienianie nazwy dowi±zaniu %s z %s na %s."
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "nie mo¿na zmieniæ nazwy %s na %s: %s"
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "podwojona nazwa dowi±zania podrzêdnego %s"
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "Zmienianie nazwy dowi±zaniu podrzêdnemu %s z %s na %s."
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "Usuwanie alternatywy wybranej rêcznie - prze³±czanie do trybu auto"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "Alternatywa %s dla %s nie jest zarejestrowana, nie bêdzie usuniêta."
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Wyrzucanie przestarza³ego dowi±zania podrzêdnego %s (%s)"
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "Automatyczne aktualizacje %s s± wy³±czone, zostawianie go bez zmian."
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 "Aby powróciæ do aktualizacji automatycznych, u¿yj `update-alternatives --"
 "auto %s'."
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Odtwarzanie z poprzedniej nieudanej aktualizacji %s ..."
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "nie mo¿na otworzyæ %s do zapisu: %s"
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "Usuniêto ostatni pakiet dostarczaj±cy %s (%s), usuwanie jej."
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5408,38 +5409,38 @@ msgstr ""
 "ostrze¿enie: %s powinien byæ dowi±zaniem symbolicznym do %s\n"
 " (lub powinien nie istnieæ); jednak¿e readlink zwróci³ b³±d: %s"
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "nie mo¿na usun±æ %s: %s"
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "nie mo¿na zrobiæ %s dowi±zaniem symbolicznym do %s: %s"
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "nie mo¿na zainstalowaæ %s jako %s: %s"
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "Zostawianie %s (%s) wskazuj±cego na %s."
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "Aktualizowanie %s (%s), ¿eby wskazywa³ na %s."
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5448,13 +5449,13 @@ msgstr ""
 "ostrze¿enie: %s powinien byæ pobocznym dowi±zaniem do\n"
 " %s lub nie powinien istnieæ; jednak¿e readlink zwróci³ b³±d: %s"
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "Usuwanie %s (%s), nie odpowiednie dla %s."
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5463,7 +5464,7 @@ msgstr ""
 "Jest tylko jeden program, który dostarcza %s\n"
 "(%s). Nie ma nic do konfigurowania.\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5472,7 +5473,7 @@ msgstr ""
 "Jest tylko jeden program, który dostarcza %s\n"
 "(%s). Nie ma nic do konfigurowania.\n"
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5485,42 +5486,48 @@ msgstr ""
 "  Wybór        Alternatywa\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 "Naci¶nij Enter, aby zatrzymaæ warto¶æ domy¶ln± [*] albo wpisz wybrany numer:"
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "U¿ywanie `%s' jako dostarczaj±cego `%s'."
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Nie mo¿na znale¼æ alternatywy `%s'."
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "b³±d zapisu na standardowe wyj¶cie: %s"
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "znaki nowej linii s± zabronione w plikach update-alternatives (%s)"
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "nie mo¿na odczytaæ %s dla %s (%s)"
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, perl-format
 msgid "missing newline after %s"
 msgstr "brakuj±cy znak nowej linii po %s"
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Powa¿ny problem: %s"
+
+#~ msgid "two modes specified: %s and --%s"
+#~ msgstr "podano dwa tryby: %s i --%s"
+
+#~ msgid "manflag"
+#~ msgstr "manflag"
diff --git a/po/pt.po b/po/pt.po
index 6fb90bb4..33d5b5ec 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: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+0300\n"
 "PO-Revision-Date: 2006-08-27 17:41+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -4470,7 +4470,7 @@ msgid "unable to close %s after read: %s"
 msgstr "não foi possível fechar %s após ler: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "não foi possível fechar %s: %s"
@@ -4562,9 +4562,10 @@ msgstr ""
 "'Scripts' preinst/postrm do pacote devem sempre especificar --package e --"
 "divert.\n"
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
-#, perl-format
-msgid "two modes specified: %s and --%s"
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
+#, fuzzy, perl-format
+msgid "two commands specified: %s and --%s"
 msgstr "dois modos específicados: %s·e·--%s"
 
 #: scripts/dpkg-divert.pl:111
@@ -4586,13 +4587,13 @@ msgid "package may not contain newlines"
 msgstr "o pacote não pode conter novas linhas"
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s necessita de um argumento <directório>"
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "opção desconhecida `%s'"
@@ -4745,7 +4746,7 @@ msgstr "criar novo diversions-old: %s"
 msgid "install new diversions: %s"
 msgstr "instalar novos desvios: %s"
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "erro interno: %s corrompido: %s"
@@ -5213,8 +5214,8 @@ msgstr ""
 "  --version                indica a versão.\n"
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
-msgstr "manflag"
+msgid "invalid update mode"
+msgstr ""
 
 #: scripts/update-alternatives.pl:135
 #, perl-format
@@ -5250,92 +5251,92 @@ msgstr ""
 "Alternativa para %s aponta para %s - a qual não foi encontrada.  A remover "
 "da lista de alternativas."
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - o status é %s."
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr " o link actualmente aponta para %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr " link actualmente inexistente"
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " link não funcional - %s"
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - prioridade %s"
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr " slave %s: %s"
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 msgid "No versions available."
 msgstr "Sem versões disponíveis."
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "A `melhor' versão corrente é %s."
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "argumento desconhecido `%s'"
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install necessita de <link> <nome> <caminho> <prioridade>"
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr "a prioridade tem de ser um inteiro"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s necessita de <nome> <caminho>"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s necessita de <nome>"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave necessita de <link> <nome> <caminho>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "o nome do slave %s está duplicado"
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "o link do slave %s está duplicado"
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "o nome %s é primário e slave"
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "o link %s é primário e slave"
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5343,31 +5344,31 @@ msgstr ""
 "necessita de --display, --config, --set, --install, --remove, --all--remove-"
 "all ou --auto"
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr "--slave apenas é permito com --install"
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Sem alternativas para %s."
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "A configurar a selecção automática de %s."
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "não foi possível remover %s: %s"
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5376,7 +5377,7 @@ msgstr ""
 "%s foi alterado (manualmente ou por um script).\n"
 "A passar para actualizações manuais apenas."
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5385,71 +5386,71 @@ msgstr ""
 "A verificar versões disponíveis de %s, a actualizar os links em %s ...\n"
 "(Pode modificar os links simbólicos se desejar - veja `man ln'.)"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "A renomear o link %s de %s para %s."
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "não foi possível renomear %s para %s: %s"
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "nome de link slave %s duplicado"
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "A renomear o link slave %s de %s para %s."
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 "A remover alternativa seleccionada manualmente - a passar para modo "
 "automático"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "Alternativa %s para %s não registada, não removida."
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "A descartar links slave obsoletos %s (%s)."
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "Actualizações automáticas de %s desactivadas, abandonando."
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 "Para voltar às actualizações automáticas digite `update-alternatives·--auto·%"
 "s'."
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "A recuperar da actualização anterior falhada de %s·..."
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "não foi possível abrir %s para escrever: %s"
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "Último pacote a fornecer %s (%s) removido. a apagar."
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5458,38 +5459,38 @@ msgstr ""
 "aviso: %s é suposto ser um link simbólico para %s\n"
 " (ou não-existente); no entanto, a sua leitura falhou: %s"
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "impossível averiguar a não existência de %s: %s"
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "não foi possível criar %s como link simbólico para %s:·%s"
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "não foi possível instalar %s·como·%s:·%s"
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "A deixar %s (%s) a apontar para %s."
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "A actualizar %s (%s) de modo a apontar para %s."
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5498,13 +5499,13 @@ msgstr ""
 "aviso:·%s·é·suposto·ser·um·link·simbólico·slave para·\n"
 " %s (ou não-existente);·no·entanto,·a·sua·leitura·falhou:·%s"
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "A remover %s (%s), não apropriado com %s."
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5513,7 +5514,7 @@ msgstr ""
 "Existe apenas um programa que fornece %s\n"
 "(%s). Nada para configurar.\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5522,7 +5523,7 @@ msgstr ""
 "Existe apenas um programa que fornece %s\n"
 "(%s). Nada para configurar.\n"
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5535,46 +5536,52 @@ msgstr ""
 "  Selecção    Alternativa\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 "Pressione enter para manter a omissão[*], ou digite o numero seleccionado: "
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "A usar `%s' para fornecer `%s'."
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Impossível encontrar alternativa `%s'."
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "erro ao escrever stdout: %s"
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "newlines proibidas em ficheiros update-alternatives (%s)"
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "erro ou leitura de fim de ficheiro %s para %s·(%s)"
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, perl-format
 msgid "missing newline after %s"
 msgstr "falta nova linha após %s"
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Problema sério: %s"
 
+#~ msgid "two modes specified: %s and --%s"
+#~ msgstr "dois modos específicados: %s·e·--%s"
+
+#~ msgid "manflag"
+#~ msgstr "manflag"
+
 #~ msgid "%s: failed to exec gzip -dc"
 #~ msgstr "%s: falhou executar gzip -dc"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f675c3f9..8797d669 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.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: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+0300\n"
 "PO-Revision-Date: 2006-10-07 17:37-0300\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -4487,7 +4487,7 @@ msgid "unable to close %s after read: %s"
 msgstr "impossível fechar %s após leitura: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "impossível fechar %s: %s"
@@ -4578,9 +4578,10 @@ msgstr ""
 "Scripts preinst/postrm de pacotes devem sempre especificar --package e --"
 "divert.\n"
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
-#, perl-format
-msgid "two modes specified: %s and --%s"
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
+#, fuzzy, perl-format
+msgid "two commands specified: %s and --%s"
 msgstr "dois modos especificados: %s e --%s"
 
 #: scripts/dpkg-divert.pl:111
@@ -4602,13 +4603,13 @@ msgid "package may not contain newlines"
 msgstr "pacote não pode conter novas linhas"
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s precisa de um argumento <diretório>"
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "opção desconhecida `%s'"
@@ -4761,7 +4762,7 @@ msgstr "criar novo divergências-antigos: %s"
 msgid "install new diversions: %s"
 msgstr "instalar novas divergências: %s"
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "erro interno: %s corrompido: %s"
@@ -5220,8 +5221,8 @@ msgstr ""
 "  --version                exibir a versão.\n"
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
-msgstr "manflag"
+msgid "invalid update mode"
+msgstr ""
 
 #: scripts/update-alternatives.pl:135
 #, perl-format
@@ -5257,92 +5258,92 @@ msgstr ""
 "Alternativa para %s aponta para %s - o qual não foi encontrado. Removendo da "
 "lista de alternativas."
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - status é %s"
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr " ligação atualmente aponta para %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr " ligação atualmente ausente"
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " ligação ilegível - %s"
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - prioridade %s"
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr " escravo %s: %s"
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 msgid "No versions available."
 msgstr "Nenhuma versão disponível."
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "`Melhor' versão atual é %s."
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "argumento desconhecido `%s'"
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install precisa de <ligação> <nome> <caminho> <prioridade>"
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr "prioridade deve ser um inteiro"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s precisa de <nome> <caminho>"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s precisa de <nome>"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave precisa de <ligação> <nome> <caminho>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "nome escravo %s duplicado"
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "ligação escrava %s duplicada"
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "nome %s é ambos primário e escravo"
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "ligação %s é ambos primário e escravo"
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5350,31 +5351,31 @@ msgstr ""
 "precisa de --display, --config, --set, --install, --remove, --all, --remove-"
 "all ou --auto"
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr "--slave somente permitido com --install"
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Nenhuma alternativa para %s."
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Configurando seleção automática de %s."
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "impossível remover %s: %s"
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5383,7 +5384,7 @@ msgstr ""
 "%s foi modificado (manualmente ou por um script).\n"
 "Mudando para atualizaçãoes automáticas somente."
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5393,71 +5394,71 @@ msgstr ""
 "(Você pode modificar as ligações simbólicas lá você mesmo caso desejado - "
 "veja `man ln'.)"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Renomeando ligação %s de %s para %s."
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "não foi possível renomear %s para %s: %s"
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "nome de ligação escrava %s duplicada"
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "Renomeando ligação escrava %s de %s para %s."
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 "Removendo alternativa selecionada manualmente - mudando para modo automático"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "Alternativa %s para %s não registrada, não removendo."
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Descartando ligação escrava obsoleta %s (%s)."
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr ""
 "Atualizações automáticas de %s estão desabilitadas, deixando-as intocadas."
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 "Para retornar para atualizações automáticas utilize `update-alternatives --"
 "auto %s'."
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Recuperando-se de atualização anterior de %s com falha ..."
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "não foi possível abrir %s para gravação: %s"
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "Último pacote fornecendo %s (%s) removido, removendo-o."
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5466,39 +5467,39 @@ msgstr ""
 "aviso: %s supostamente seria uma ligação simbólica para %s\n"
 " (ou inexistente); porém, readlink falhou: %s"
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "não foi possível assegurar %s inexistente: %s"
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr ""
 "não foi possível fazer com que %s fosse uma ligação simbólica para %s: %s"
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "não foi possível instalar %s como %s: %s"
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "Deixando %s (%s) apontando para %s."
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "Atualizando %s (%s) apontando para %s."
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5507,13 +5508,13 @@ msgstr ""
 "aviso: %s supostamente seria uma ligação simbólica escrava para\n"
 " %s, ou inexistente; porém, readlink falhou: %s"
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "Removendo %s (%s). inapropriado com %s."
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5522,7 +5523,7 @@ msgstr ""
 "Existe somente 1 programa que fornece %s\n"
 "(%s). Nada a ser configurado.\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5531,7 +5532,7 @@ msgstr ""
 "Existe somente 1 programa que fornece %s\n"
 "(%s). Nada a ser configurado.\n"
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5544,46 +5545,52 @@ msgstr ""
 "  Seleção      Alternativa\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 "Pressione enter para manter o padrão[*] ou digite o número da seleção: "
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "Usando `%s' para fornecer `%s'."
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Não foi possível encontrar alternativa `%s'."
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "erro ao gravar na stdout: %s"
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "novas linhas proibidas em arquivos update-alternatives (%s)"
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "erro ou eof lendo %s para %s (%s)"
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, perl-format
 msgid "missing newline after %s"
 msgstr "nova linha faltando para %s"
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Problema sério: %s"
 
+#~ msgid "two modes specified: %s and --%s"
+#~ msgstr "dois modos especificados: %s e --%s"
+
+#~ msgid "manflag"
+#~ msgstr "manflag"
+
 #~ msgid "%s: failed to exec gzip -dc"
 #~ msgstr "%s: não foi possível executar gzip -dc"
 
diff --git a/po/ro.po b/po/ro.po
index 818d455b..c0582561 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ro\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+0300\n"
 "PO-Revision-Date: 2006-12-22 13:49+0200\n"
 "Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -4541,7 +4541,7 @@ msgid "unable to close %s after read: %s"
 msgstr "imposibil a închide %s după citire: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "imposibil a închide %s: %s"
@@ -4634,9 +4634,10 @@ msgstr ""
 "Scripturile preinst/postrm ale pachetelor ar trebui să specifice --package "
 "şi --divert.\n"
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
-#, perl-format
-msgid "two modes specified: %s and --%s"
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
+#, fuzzy, perl-format
+msgid "two commands specified: %s and --%s"
 msgstr "au fost specificate două moduri: %s şi --%s"
 
 #: scripts/dpkg-divert.pl:111
@@ -4658,13 +4659,13 @@ msgid "package may not contain newlines"
 msgstr "pachetul nu poate conţine caractere „linie nouă”"
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s necesită un <director> ca argument"
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "„%s” opţiune necunoscută"
@@ -4817,7 +4818,7 @@ msgstr "crearea noii redirectări anterioare: %s"
 msgid "install new diversions: %s"
 msgstr "instalarea noilor redirectări: %s"
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "eroare internă: %s corupt: %s"
@@ -5291,10 +5292,9 @@ msgstr ""
 "  --help                   afişează acest ajutor\n"
 "  --version                afişează versiunea\n"
 
-# AJUTOR: totuşi ce e ăsta?
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
-msgstr "manflag"
+msgid "invalid update mode"
+msgstr ""
 
 #: scripts/update-alternatives.pl:135
 #, perl-format
@@ -5330,92 +5330,92 @@ msgstr ""
 "Alternativa pentru %s indică spre %s - care nu  fost găsit. Se şterge din "
 "lista de alternative."
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - starea este %s."
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr " legătura indică acum spre %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr " legătura este absentă acum"
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " legătura nu poate fi citită - %s"
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - prioritatea %s"
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr " sclav %s: %s"
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 msgid "No versions available."
 msgstr "Nici o versiune disponibilă."
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "Cea mai „bună” versiune în prezent este %s."
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "argument necunoscut „%s”"
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install necesită <legătură> <nume> <cale> <prioritate>"
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr "prioritatea trebuie să fie un întreg"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s necesită <nume> <cale>"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s necesită <nume>"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave necesită <legătură> <nume> <cale>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "numele de sclav %s este duplicat"
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "legătura de sclav %s este duplicată"
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "numele %s este atât primar cât şi sclav"
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "legătura %s este atât primară cât şi sclavă"
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5423,31 +5423,31 @@ msgstr ""
 "est enevoie de --display, --config, --set, --install, --remove, --all, --"
 "remove-all sau--auto"
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr "--slave este permis doar cu --install"
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Nu există alternative pentru %s."
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Se pregătesc selecţiile automate ale lui %s."
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "imposibil a şterge %s: %s"
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5456,7 +5456,7 @@ msgstr ""
 "%s a fost schimbat (manual sau de un script).\n"
 "Se comută pe actualizare strict manuală."
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5467,71 +5467,71 @@ msgstr ""
 "(Puteţi modifica the legăturile simbolice de acolo dacă doreţi - a se vedea "
 "„man ln”.)"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Se redenumeşte legătura %s din %s în %s."
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "imposibil a redenumi %s în %s: %s"
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "numele de legătură sclav %s este duplicat"
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "Se redenumeşte legătura sclav %s din %s în %s."
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "Se şterge alternativa selectată manual - se comută în modul automat"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "Alternativa %s pentru %s nu este înregistrată, nu se şterge."
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Se renunţă la legătura-sclav învechită %s (%s)."
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr ""
 "Actualizările automate ale lui %s sunt dezactivate, va fi lăsat în pace."
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 "Pentru a vă reîntoarce laactulizarea automată folosiţi „update-alternatives "
 "--auto %s”."
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Recupereare din actualizarea anterioară a lui %s care a eşuat ..."
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "imposibil a deschide %s pentru scriere: %s"
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr ""
 "Ultimul pachet care funiza %s (%s) a fost şters, se va şterge şi acesta."
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5540,38 +5540,38 @@ msgstr ""
 "avertisment: %s ar fi trebuit să fie o legătură simbolică spre %s\n"
 " (sau nonexistent); totuşi funcţia readlink a eşuat: %s"
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "imposibil a asigura %s nonexistent: %s"
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "imposibil a face %s o legătură simbolică către %s: %s"
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "imposibil a instala %s ca %s: %s"
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "Se lasă %s (%s) să indice spre %s."
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "Se actualizează %s (%s) să indice spre %s."
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5580,13 +5580,13 @@ msgstr ""
 "avertisment: %s ar fi trebuit să fie o legătură simbolică-sclav spre\n"
 " %s, sau nonexistent; totuşi funcţia readlink a eşuat: %s"
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "Se şterge %s (%s), nepotrivit cu %s."
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5595,7 +5595,7 @@ msgstr ""
 "Există doar un program care furnizează %s\n"
 "(%s). Nu e nimic de configurat.\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5604,7 +5604,7 @@ msgstr ""
 "Există doar un program care furnizează %s\n"
 "(%s). Nu e nimic de configurat.\n"
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5617,48 +5617,55 @@ msgstr ""
 "  Selecţia     Alternativa\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 "Apăsaţi enter pentru a păstra valoarea implicită[*], sau introduceţi numărul "
 "selecţiei: "
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "Se foloseşte „%s” pentru a furniza „%s”."
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Alternativa „%s” nu poate fi găsită."
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "eroare la scriere la ieşirea standard: %s"
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 "caracterele „linie nouă” sunt interzise în fişierele update-alternatives (%s)"
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "eroare sau sfârşit de fişier la citirea lui %s pentru %s (%s)"
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, perl-format
 msgid "missing newline after %s"
 msgstr "lipseşte linie nouă după %s"
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Problemă gravă: %s"
 
+#~ msgid "two modes specified: %s and --%s"
+#~ msgstr "au fost specificate două moduri: %s şi --%s"
+
+# AJUTOR: totuşi ce e ăsta?
+#~ msgid "manflag"
+#~ msgstr "manflag"
+
 #~ msgid "%s: failed to exec gzip -dc"
 #~ msgstr "%s: eşec la execuţia gzip -dc"
 
diff --git a/po/ru.po b/po/ru.po
index 3de1ef02..4ae487dc 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.13.23\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+0300\n"
 "PO-Revision-Date: 2006-10-07 17:41+0400\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -4559,7 +4559,7 @@ msgid "unable to close %s after read: %s"
 msgstr "не удалось закрыть %s после чтения: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "не удалось закрыть %s: %s"
@@ -4651,9 +4651,10 @@ msgstr ""
 "В сценариях preinst/postrm пакетов всегда нужно указывать --package и --"
 "divert.\n"
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
-#, perl-format
-msgid "two modes specified: %s and --%s"
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
+#, fuzzy, perl-format
+msgid "two commands specified: %s and --%s"
 msgstr "указано два режима: %s и --%s"
 
 #: scripts/dpkg-divert.pl:111
@@ -4675,13 +4676,13 @@ msgid "package may not contain newlines"
 msgstr "пакет не может содержать символов новой строки"
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s требуется аргумент <каталог>"
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "неизвестный параметр `%s'"
@@ -4834,7 +4835,7 @@ msgstr "создание нового diversions-old: %s"
 msgid "install new diversions: %s"
 msgstr "установка нового файла diversions: %s"
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "внутренняя ошибка: %s повреждён: %s"
@@ -5292,8 +5293,8 @@ msgstr ""
 "  --version                вывести номер версии.\n"
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
-msgstr "manflag"
+msgid "invalid update mode"
+msgstr ""
 
 #: scripts/update-alternatives.pl:135
 #, perl-format
@@ -5329,92 +5330,92 @@ msgstr ""
 "Альтернатива для %s указывает на %s, которая не найдена. Удаляется из списка "
 "альтернатив."
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr "состояние %s: %s."
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr " ссылка сейчас указывает на %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr " ссылка сейчас отсутствует"
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " ссылка не читается - %s"
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr "приоритет %s: %s"
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr " подчинённый %s: %s"
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 msgid "No versions available."
 msgstr "Нет доступных версий."
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "Текущая `лучшая' версия: %s."
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "неизвестный аргумент `%s'"
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "для --install требуется указать <ссылку> <имя> <путь> <приоритет>"
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr "приоритет должен быть целым числом"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "для --%s требуется <имя> <путь>"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "для --%s требуется <имя>"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr "для --slave требуются аргументы <ссылка> <имя> <путь>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "повторяющееся подчинённое имя %s"
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "повторяющаяся подчинённая ссылка %s"
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "имя %s принадлежит и мастеру и подчинённому"
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "ссылка %s принадлежит и мастеру и подчинённому"
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5422,31 +5423,31 @@ msgstr ""
 "требуется --display, --config, --set, --install, --remove, --all, --remove-"
 "all или --auto"
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr "команда --slave возможна только вместе с --install"
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Нет альтернатив для %s."
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Настройка автоматического выбора %s."
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "не удалось удалить %s: %s"
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5455,7 +5456,7 @@ msgstr ""
 "%s была изменена (вручную или сценарием).\n"
 "Переключение на режим только ручного обновления."
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5464,71 +5465,71 @@ msgstr ""
 "Проверка доступных версий %s, обновление ссылок в %s ...\n"
 "(Вы можете изменить символические ссылки, если хотите -- смотрите `man ln'.)"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Переименовывается ссылка %s из %s в %s."
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "не удалось переименовать %s в %s: %s"
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "повторяется имя подчинённой ссылки %s"
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "Переименовывается подчинённая ссылка %s из %s в %s."
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 "Удаляется альтернатива выбранная вручную -- переключение в автоматический "
 "режим"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "Альтернатива %s для %s не зарегистрирована, не удаляется."
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Отбрасывается устаревшая подчинённая ссылка %s (%s)."
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "Автоматическое обновление %s выключено, оставлено как есть."
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 "Чтобы вернуться в автоматический режим выполните команду `update-"
 "alternatives --auto %s'."
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Восстановление раннее неудачного обновления %s ..."
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "не удалось открыть %s на запись: %s"
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "Последний пакет, предоставлявший %s (%s) удалён, удаление."
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5537,38 +5538,38 @@ msgstr ""
 "предупреждение: %s предположительно является символической ссылкой на %s\n"
 " (или на не существующую); однако, readlink завершился неудачно: %s"
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "не удалось убедиться в не существовании %s: %s"
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "не удалось создать символическую ссылку %s на %s: %s"
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "не удалось установить %s как %s: %s"
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "Оставляется %s (%s), указывающая на %s."
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "Обновляется %s (%s), указывающая на %s."
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5578,13 +5579,13 @@ msgstr ""
 "ссылкой на %s, или на несуществующую; однако, readlink завершилась неудачно: "
 "%s"
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "Удаляется %s (%s) не соответствующая %s."
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5593,7 +5594,7 @@ msgstr ""
 "Есть только одна программа, которая предоставляет %s\n"
 "(%s). Настраивать нечего.\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5602,7 +5603,7 @@ msgstr ""
 "Есть только одна программа, которая предоставляет %s\n"
 "(%s). Настраивать нечего.\n"
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5615,47 +5616,53 @@ msgstr ""
 "  Выбор        Альтернатива\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 "Нажмите enter, чтобы сохранить значение по умолчанию[*], или введите "
 "выбранное число: "
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "Используется `%s' для предоставления `%s'."
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Не удалось найти альтернативу `%s'."
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "ошибка записи в stdout: %s"
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "символы новой строки запрещены в файлах update-alternatives (%s)"
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "ошибка или конец файла при чтении %s для %s (%s)"
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, perl-format
 msgid "missing newline after %s"
 msgstr "пропущен символ новой строки после %s"
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Серьёзная проблема: %s"
 
+#~ msgid "two modes specified: %s and --%s"
+#~ msgstr "указано два режима: %s и --%s"
+
+#~ msgid "manflag"
+#~ msgstr "manflag"
+
 #~ msgid "%s: failed to exec gzip -dc"
 #~ msgstr "%s: не удалось выполнить gzip -dc"
 
diff --git a/po/sk.po b/po/sk.po
index ec446a36..56dbf9c0 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: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+0300\n"
 "PO-Revision-Date: 2006-09-13 13:13+0200\n"
 "Last-Translator: Peter Mann <Peter.Mann@tuke.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -4420,7 +4420,7 @@ msgid "unable to close %s after read: %s"
 msgstr "nedá sa zatvoriť %s po načítaní: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "nedá sa zatvoriť %s: %s"
@@ -4510,9 +4510,10 @@ msgstr ""
 "Predinštalačné a poinštalačné skripty by mali vždy používať --package\n"
 "a --divert.\n"
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
-#, perl-format
-msgid "two modes specified: %s and --%s"
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
+#, fuzzy, perl-format
+msgid "two commands specified: %s and --%s"
 msgstr "zadané dva režimy: %s a --%s"
 
 #: scripts/dpkg-divert.pl:111
@@ -4534,13 +4535,13 @@ msgid "package may not contain newlines"
 msgstr "názov balíka nemôže obsahovať znaky nového riadku"
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s vyžaduje parameter <adresár>"
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "neznáma voľba `%s'"
@@ -4693,7 +4694,7 @@ msgstr "vytváranie nového súboru diversions-old: %s"
 msgid "install new diversions: %s"
 msgstr "inštalácia nového súboru diversions: %s"
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "interná chyba: %s poškodenie: %s"
@@ -5146,8 +5147,8 @@ msgstr ""
 "  --version                zobrazí verziu\n"
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
-msgstr "manflag"
+msgid "invalid update mode"
+msgstr ""
 
 #: scripts/update-alternatives.pl:135
 #, perl-format
@@ -5183,92 +5184,92 @@ msgstr ""
 "Alternatíva %s ukazuje na verziu %s, ktorá sa nenašla. Odstraňuje sa zo "
 "zoznamu alternatív."
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - stav je %s."
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr " linka práve ukazuje na %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr " odkaz momentálne chýba"
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " odkaz sa nedá načítať = %s"
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - priorita %s"
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr " závislosť %s: %s"
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 msgid "No versions available."
 msgstr "Nie sú dostupné žiadne verzie."
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "Momentálne je `najlepšia' verzia %s."
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "neznámy parameter `%s'"
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install vyžaduje <linku> <názov> <cestu> <prioritu>"
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr "priorita musí byť celé číslo"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s vyžaduje <názov> <cestu>"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s vyžaduje <názov>"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave vyžaduje <linku> <názov> <cestu>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "závislý názov %s je duplicitný"
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "závislý odkaz %s je duplicitný"
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "názov %s je primárny aj závislý"
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "odkaz %s je primárny aj závislý"
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5276,31 +5277,31 @@ msgstr ""
 "potrebujete --display, --config, --set, --install, --remove, --all, --remove-"
 "all alebo --auto"
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr "--slave je povolené iba s --install"
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Žiadne alternatívy pre %s"
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Nastavuje sa automatický výber %s"
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "nedá sa odstrániť %s: %s"
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5309,7 +5310,7 @@ msgstr ""
 "%s sa zmenil (manuálne alebo skriptom).\n"
 "Prepína sa len na manuálne aktualizácie."
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5318,70 +5319,70 @@ msgstr ""
 "Kontrolujú sa dostupné verzie %s, aktualizujú sa odkazy v %s ...\n"
 "(Odkazy môžete zmeniť podľa vašich potrieb - pozrite si `man ln'.)"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Linka %s sa premenuje z %s na %s."
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "nedá sa premenovať %s na %s: %s"
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "názov závislého odkazu %s je duplicitný"
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "Závislý odkaz %s sa premenuje z %s na %s."
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 "Odstraňuje sa manuálne zvolená alternatíva - prepína sa na automatický režim"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "Alternatíva %s pre %s nie je registrovaná, takže sa neodstraňuje."
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Zahadzuje sa zastaralý závislý odkaz %s (%s)."
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "Automatické aktualizácie %s sú zakázané, zmeny sa nevykonajú."
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 "Použitím `update-alternatives --auto %s' sa prepnete na automatické "
 "aktualizácie."
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Obnovuje sa predchádzajúca nefunkčná aktualizácia %s ..."
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "%s sa nedá otvoriť na zápis: %s"
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "Posledný balík poskytujúci %s (%s) sa odstránil, maže sa."
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5390,38 +5391,38 @@ msgstr ""
 "upozornenie: %s by mal byť symbolický odkaz na %s,\n"
 " (alebo odkaz neexistuje), ale volanie readlink zlyhalo: %s"
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "nedá sa zaručiť, že %s neexistuje: %s"
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "nedá sa urobiť %s ako symbolická linka na %s: %s"
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "nedá sa nainštalovať %s ako %s: %s"
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "%s (%s) sa ponecháva, aby ukazoval na %s."
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "%s (%s) sa aktualizuje, aby ukazoval na %s."
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5430,13 +5431,13 @@ msgstr ""
 "upozornenie: %s by mal byť závislý symbolický odkaz na %s,\n"
 " (alebo odkaz neexistuje), ale volanie readlink zlyhalo: %s"
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "%s (%s) sa odstraňuje, nepatrí k %s."
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5445,7 +5446,7 @@ msgstr ""
 "Existuje len jeden program poskytujúci %s\n"
 "(%s). Nie je čo nastavovať.\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5454,7 +5455,7 @@ msgstr ""
 "Existuje len jeden program poskytujúci %s\n"
 "(%s). Nie je čo nastavovať.\n"
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5467,46 +5468,52 @@ msgstr ""
 "  Výber        Alternatíva\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 "Stlačením enter zvolíte predvolenú možnosť[*], ináč zadajte číslo výberu: "
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "Použije sa `%s' na poskytnutie `%s'."
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Nedá sa nájsť alternatíva `%s'."
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "chyba pri zápise na štandartný výstup: %s"
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "nové riadky sú zakázané v súboroch update-alternatives (%s)"
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "chyba alebo koniec súboru pri čítaní %s pre %s (%s)"
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, perl-format
 msgid "missing newline after %s"
 msgstr "chýbajúci nový riadok za %s"
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Vážny problém: %s"
 
+#~ msgid "two modes specified: %s and --%s"
+#~ msgstr "zadané dva režimy: %s a --%s"
+
+#~ msgid "manflag"
+#~ msgstr "manflag"
+
 #~ msgid "%s: failed to exec gzip -dc"
 #~ msgstr "%s: zlyhalo vykonanie gzip -dc"
 
diff --git a/po/sv.po b/po/sv.po
index 98c7d7ab..bbe2d589 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: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+0300\n"
 "PO-Revision-Date: 2006-11-01 19:58+0100\n"
 "Last-Translator: Peter Karlsson <peterk@debian.org>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
@@ -4389,7 +4389,7 @@ msgid "unable to close %s after read: %s"
 msgstr "kunde inte stänga %s efter läsning: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "kunde inte stänga %s: %s"
@@ -4479,9 +4479,10 @@ msgstr ""
 "anges. Skripten preinst/postrm i paket skall alltid ange --package och --"
 "divert.\n"
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
-#, perl-format
-msgid "two modes specified: %s and --%s"
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
+#, fuzzy, perl-format
+msgid "two commands specified: %s and --%s"
 msgstr "två lägen angivna: %s och --%s"
 
 #: scripts/dpkg-divert.pl:111
@@ -4503,13 +4504,13 @@ msgid "package may not contain newlines"
 msgstr "paket kan inte innehålla nyradstecken"
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s behöver ett <katalog>-argument"
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "okänd flagga \"%s\""
@@ -4662,7 +4663,7 @@ msgstr "skapa ny diversions-old: %s"
 msgid "install new diversions: %s"
 msgstr "installera ny diversions: %s"
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "internt fel: %s trasig: %s"
@@ -5118,8 +5119,8 @@ msgstr ""
 "  --version                visa versionen.\n"
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
-msgstr "manflagga"
+msgid "invalid update mode"
+msgstr ""
 
 #: scripts/update-alternatives.pl:135
 #, perl-format
@@ -5155,92 +5156,92 @@ msgstr ""
 "Alternativet för %s pekar till %s - vilket inte hittades. Tar bort från "
 "listan över alternativ."
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - status är %s."
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr " länk pekar för närvarande på %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr " länk saknas för närvarande"
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " länk oläslig - %s"
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - prioritet %s"
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr " slav %s: %s"
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 msgid "No versions available."
 msgstr "Inga versioner tillgängliga."
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "Nuvarande \"bästa\" version är %s."
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "okänt argument \"%s\""
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install behöver <länk> <namn> <sökväg> <prioritet>"
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr "prioritet måste vara ett heltal"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s behöver <namn> <sökväg>"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s behöver <namn>"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave behöver <länk> <namn> <sökväg>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "slavnamnet %s duplicerat"
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "slavlänken %s duplicerad"
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "namnet %s är både primär och slav"
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "länken %s är både primär och slav"
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5248,31 +5249,31 @@ msgstr ""
 "behöver --display, --config, --set, --install, --remove, --all, --remove-all "
 "eller --auto"
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr "--slave tillåts endast tillsammans med --install"
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Inga alternativ för %s."
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Aktiverar automatiskt val av %s."
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "kunde inte ta bort %s: %s"
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5281,7 +5282,7 @@ msgstr ""
 "%s har ändrats (manuellt eller av ett skript).\n"
 "Växlar till enbart manuella uppdateringar."
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5290,69 +5291,69 @@ msgstr ""
 "Kontrollerar tillgängliga versioner av %s, uppdaterar länkar i %s ...\n"
 "(Du kan ändra de symboliska länkarna själv om du vill - se \"man ln\".)"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Byter namn på länken %s från %s till %s."
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "kunde inte byta namn på %s till %s: %s"
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "slavlänknamnet %s duplicerat"
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "Byter namn på slavlänken %s från %s till %s."
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "Tar bort manuellt valda alternativ - växlar till autoläge"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "Alternativet %s för %s har inte registrerats, tar inte bort."
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Kastar bort föråldrad slavlänk %s (%s)."
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "Automatiska uppdateringar av %s är inaktiverad, låter den vara."
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 "För att återgå till automatiska uppdateringar, använd \"update-alternatives "
 "--auto %s\"."
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Återhämtar från tidigare misslyckad uppdatering av %s ..."
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "kunde inte öppna %s för skrivning: %s"
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "Det sista paketet som tillhandahöll %s (%s) avinstallerades, tar bort."
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5361,38 +5362,38 @@ msgstr ""
 "varning: %s skulle vara en symbolisk länk till %s\n"
 " (eller inte finnas); readlink misslyckades dock: %s"
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "kunde inte försäkra att %s inte finns: %s"
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "kunde inte göra %s till en symbolisk länk till %s: %s"
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "kunde inte installera %s som %s: %s"
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "Lämnar %s (%s) att peka på %s."
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "Uppdaterar %s (%s) att peka på %s."
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5401,13 +5402,13 @@ msgstr ""
 "varning: %s skulle vara en slav-symbolisk länk till\n"
 " %s, eller inte finnas; readlink misslyckades dock: %s"
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "Tar bort %s (%s), inte lämplig med %s."
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5416,7 +5417,7 @@ msgstr ""
 "Endast ett program tillhandahåller %s\n"
 "(%s). Inget att konfigurera.\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5425,7 +5426,7 @@ msgstr ""
 "Endast ett program tillhandahåller %s\n"
 "(%s). Inget att konfigurera.\n"
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5438,46 +5439,52 @@ msgstr ""
 "    Urval      Alternativ\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 "Tryck Enter för att behålla standardvärdet[*], eller ange ett urvalsnummer: "
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "Låter \"%s\" tillhandahålla \"%s\"."
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Hittar inte alternativet \"%s\"."
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "fel vid skrivning till stdout: %s"
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "nyradstecken tillåts inte i update-alternatives-file (%s)"
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "fel eller filslut vid läsning av %s för %s (%s)"
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, perl-format
 msgid "missing newline after %s"
 msgstr "saknat nyradstecken efter %s"
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Allvarligt problem: %s"
 
+#~ msgid "two modes specified: %s and --%s"
+#~ msgstr "två lägen angivna: %s och --%s"
+
+#~ msgid "manflag"
+#~ msgstr "manflagga"
+
 #~ msgid "%s: failed to exec gzip -dc"
 #~ msgstr "%s: kunde inte köra gzip -dc"
 
diff --git a/po/tl.po b/po/tl.po
index 4a7b5786..cbdc9ed3 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: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+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"
@@ -4396,7 +4396,7 @@ msgid "unable to close %s after read: %s"
 msgstr "bigo sa pagsara matapos ng pagbasa: `%.255s'"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, fuzzy, perl-format
 msgid "unable to close %s: %s"
 msgstr "hindi ma-execute ang %s"
@@ -4458,9 +4458,10 @@ msgid ""
 "divert.\n"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
 #, perl-format
-msgid "two modes specified: %s and --%s"
+msgid "two commands specified: %s and --%s"
 msgstr ""
 
 #: scripts/dpkg-divert.pl:111
@@ -4485,13 +4486,13 @@ msgid "package may not contain newlines"
 msgstr "Walang laman ang paketeng `%s' (!)\n"
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, fuzzy, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--build ay nangangailangan ng argumentong directory"
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, fuzzy, perl-format
 msgid "unknown option `%s'"
 msgstr "di kilalang opsyon --%s"
@@ -4640,7 +4641,7 @@ msgstr "error sa pagbasa sa dibersyon [i]"
 msgid "install new diversions: %s"
 msgstr "hindi mailuklok ang bagong bersyon ng `%.255s'"
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, fuzzy, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "%s: internal gzip error: pagsulat: `%s'"
@@ -5012,7 +5013,7 @@ msgid ""
 msgstr ""
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
+msgid "invalid update mode"
 msgstr ""
 
 #: scripts/update-alternatives.pl:135
@@ -5047,248 +5048,248 @@ msgid ""
 "alternatives."
 msgstr ""
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr ""
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 #, fuzzy
 msgid "No versions available."
 msgstr "(walang paglalarawan)"
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, fuzzy, perl-format
 msgid "unknown argument `%s'"
 msgstr "di kilalang uri ng compression `%s'!"
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr ""
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, fuzzy, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s ay nangangailangan ng argumentong pangalan ng talaksang .deb"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, fuzzy, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s ay hindi tumatanggap ng mga argumento"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
 msgstr ""
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr ""
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, fuzzy, perl-format
 msgid "unable to remove %s: %s"
 msgstr "hindi ma-execute ang %s"
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
 "Switching to manual updates only."
 msgstr ""
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
 "(You may modify the symlinks there yourself if desired - see `man ln'.)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, fuzzy, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Binubuklat ang %s (mula sa %s) ...\n"
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, fuzzy, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "hindi ma-stat ang %s `%.250s'"
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr ""
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr ""
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr ""
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, fuzzy, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "hindi mabuksan ang pinagmulan na talaksang `%.250s'"
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr ""
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
 " (or nonexistent); however, readlink failed: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, fuzzy, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "hindi ma-execute ang bagong %s"
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, fuzzy, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "hindi makagawa ng backup symlink para sa `%.255s'"
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, fuzzy, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "hindi maluklok ang `%.250s' bilang `%.250s'"
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
 " %s, or nonexistent; however, readlink failed: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5296,14 +5297,14 @@ msgid ""
 msgstr ""
 "  %.250s ay nagbibigay ng %.250s ngunit ito'y tatanggalan ng pagkaayos.\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
 "(%s). Nothing to configure.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5312,41 +5313,41 @@ msgid ""
 "-----------------------------------------------\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, fuzzy, perl-format
 msgid "error writing stdout: %s"
 msgstr "error sa pagsulat ng `%s'"
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, fuzzy, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "bigo sa pagbasa ng %s mula sa %.255s"
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, fuzzy, perl-format
 msgid "missing newline after %s"
 msgstr "sira ang talaksang `%.250s' - may kulang na newline matapos ang %.250s"
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 2581c60a..532b5cc1 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: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+0300\n"
 "PO-Revision-Date: 2006-11-24 15:31+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -4595,7 +4595,7 @@ msgid "unable to close %s after read: %s"
 msgstr "không thể đóng %s sau khi đọc: %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "không thể đóng %s: %s"
@@ -4700,9 +4700,10 @@ msgstr ""
 "Văn lệnh cài đặt sẵn/sau khi gỡ bỏ luôn luôn nên xác định hai tùy chọn\n"
 "« --package » và « --divert ».\n"
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
-#, perl-format
-msgid "two modes specified: %s and --%s"
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
+#, fuzzy, perl-format
+msgid "two commands specified: %s and --%s"
 msgstr "hai chế độ đã xác định: %s và « --%s »"
 
 #: scripts/dpkg-divert.pl:111
@@ -4724,13 +4725,13 @@ msgid "package may not contain newlines"
 msgstr "« package » (gói) không thể chứa ký tự dòng mới"
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "« --%s » cần một đối số kiểu <thư mục>"
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "không biết tùy chọn « %s »"
@@ -4883,7 +4884,7 @@ msgstr "tạo « diversions-old » mới: %s"
 msgid "install new diversions: %s"
 msgstr "cài đặt sự chuyển hướng mới: %s"
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "lỗi nội bộ : %s bị hỏng: %s"
@@ -5381,8 +5382,8 @@ msgstr ""
 "\t(phiên bản)\n"
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
-msgstr "manflag (cờ trang hướng dẫn)"
+msgid "invalid update mode"
+msgstr ""
 
 #: scripts/update-alternatives.pl:135
 #, perl-format
@@ -5418,94 +5419,94 @@ msgstr ""
 "Điều xen kẽ cho %s chỉ tới %s — mà không được tìm, nên gỡ bỏ ra danh sách "
 "các điều xen kẽ."
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s — trạng thái là %s."
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr " liên kết hiện thời chỉ tới %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr " hiện thời không có liên kết"
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " không thể đọc liên kết — %s"
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s — ưu tiên %s"
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr " phụ %s: %s"
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 msgid "No versions available."
 msgstr "Không có phiên bản sẵn sàng."
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "Phiên bản « tốt nhất » hiện thời là %s."
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "không biết đối số « %s »"
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr ""
 "« --install » (cài đặt) cần thiết bốn giá trị <liên_kết> <tên> <đường_dẫn> "
 "<ưu_tiên>"
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr "« ưu tiên » phải là số nguyên"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "« --%s » cần hai giá trị <tên> <đường_dẫn>"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "« --%s » cần giá trị <tên>"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr "« --slave » (phụ) cần thiết ba giá trị <liên_kết> <tên> <đường_dẫn>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "tên phụ %s bị nhân đôi"
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "liên kết phụ %s bị nhân đôi"
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "tên %s là cả hai kiểu chính và phụ"
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "liên kết %s là cả hai kiểu chính và phụ"
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5520,31 +5521,31 @@ msgstr ""
 " •--remove-all \tgỡ bỏ tất cả\n"
 " •--auto\t\t\ttự động"
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr "cho phép « --slave » (phụ) chỉ với « --install » (cài đặt)"
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Không có điều xen kẽ cho %s."
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Đang thiết lập việc tự động chọn %s"
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "không thể gỡ bỏ %s: %s"
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5553,7 +5554,7 @@ msgstr ""
 "%s đã bị thay đổi (bằng tay hoặc bằng văn lệnh).\n"
 "Thế thì đang chuyển đổi sang chỉ việc cập nhật bằng tay."
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5564,70 +5565,70 @@ msgstr ""
 "(Bạn có thể sửa đổi những liên kết tượng trưng tại đó nếu bạn muốn:\n"
 "xem « man ln ».)"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Đang thay đổi tên liên kết %s từ %s thành %s."
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "không thể thay đổi tên %s thành %s: %s"
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "tên liên kết phụ %s bị nhân đôi"
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "Đang thay đổi tên liên kết phụ %s từ %s thành %s."
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 "Đang gỡ bỏ điều xen kẽ đã chọn bằng tay — đang chuyển đổi sang chế độ tự động"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "Điều xen kẽ %s cho %s không được đăng ký nên không gỡ bỏ."
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Đang hủy liên kết phụ cũ %s (%s)."
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "Khả năng tự động cập nhật %s bị tắt nên không làm gì."
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 "Để bật lại khả năng tự động cập nhật, hãy dùng lệnh « update-alternatives --"
 "auto %s »."
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Đang phục hồi sau việc cập nhật %s bị lỗi trước ..."
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "không thể mở %s để ghi: %s"
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "Gói cuối cùng cung cấp %s (%s) bị gỡ bỏ nên xóa nó."
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5636,38 +5637,38 @@ msgstr ""
 "cảnh báo : %s nên là liên kết tượng trưng đến %s\n"
 " (hay không tồn tại); tuy nhiên, lỗi readlink: %s"
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "không thể đảm bảo %s không tồn tại: %s"
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "không thể làm cho %s là liên kết tượng trưng đến %s: %s"
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "không thể cài đặt %s như là %s: %s"
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "Đang để lại %s (%s) chỉ tới %s."
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "Đang cập nhật %s (%s) để chỉ tới %s."
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5676,13 +5677,13 @@ msgstr ""
 "cảnh báo : %s nên là liên kết tượng trưng phụ đến %s,\n"
 " hoặc không tồn tại; tuy nhiên, việc readlink bị lỗi: %s"
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "Đang gỡ bỏ %s (%s) vì không tương thích với %s."
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5691,7 +5692,7 @@ msgstr ""
 "Có chỉ 1 chương trình cung cấp %s (%s)\n"
 "nên không có gì cần cấu hình.\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5700,7 +5701,7 @@ msgstr ""
 "Có chỉ 1 chương trình cung cấp %s (%s)\n"
 "nên không có gì cần cấu hình.\n"
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5713,46 +5714,52 @@ msgstr ""
 "  Lựa chọn    Sự xen kẽ\n"
 "━━━━━━━━━━━━━━━━━━━━━\n"
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr "Hãy bấm phím Enter để giữ giá trị mặc định[*], hoặc gõ số lựa chọn: "
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "Đang dùng « %s » để cung cấp « %s »."
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Không tìm thấy điều xen kẽ « %s »."
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "gặp lỗi khi ghi thiết bị xuất: %s"
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 "không cho phép ký tự dòng mới trong tập tin « update-alternatives » (%s)"
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "gặp lỗi hoặc kết thúc tập tin khi đọc %s cho %s (%s)"
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, perl-format
 msgid "missing newline after %s"
 msgstr "thiếu ký tự dòng mới sau %s"
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Gặp lỗi nghiêm trọng: %s"
 
+#~ msgid "two modes specified: %s and --%s"
+#~ msgstr "hai chế độ đã xác định: %s và « --%s »"
+
+#~ msgid "manflag"
+#~ msgstr "manflag (cờ trang hướng dẫn)"
+
 #~ msgid "%s: failed to exec gzip -dc"
 #~ msgstr "%s: việc thực hiện « gzip -dc » bị lỗi"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6e15d727..1f1f9897 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+0300\n"
 "PO-Revision-Date: 2007-03-18 19:25+0800\n"
 "Last-Translator: Kov Chai <tchaikov@gmail.com>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
@@ -4311,7 +4311,7 @@ msgid "unable to close %s after read: %s"
 msgstr "读取完之后无法关闭 %s：%s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "无法关闭 %s：%s"
@@ -4398,9 +4398,10 @@ msgstr ""
 "在删除转移项的时候，--package 或 --local 选项和 --divert 选项必须一致。\n"
 "软件包的 preinst 和 postrm 脚本通常应当指定 --package 和 --divert 选项。\n"
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
-#, perl-format
-msgid "two modes specified: %s and --%s"
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
+#, fuzzy, perl-format
+msgid "two commands specified: %s and --%s"
 msgstr "指定了两种模式：%s 以及 --%s"
 
 #: scripts/dpkg-divert.pl:111
@@ -4422,13 +4423,13 @@ msgid "package may not contain newlines"
 msgstr "软件包不可以含有换行符"
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s 需要一个 <directory> 参数"
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "无法识别的选项 “%s”"
@@ -4581,7 +4582,7 @@ msgstr "创建新的 diversions-old：%s"
 msgid "install new diversions: %s"
 msgstr "安装新的转移项：%s"
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "内部错误：%s 损坏：%s"
@@ -5030,8 +5031,8 @@ msgstr ""
 "   --version                     显示版本信息。\n"
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
-msgstr "manflag"
+msgid "invalid update mode"
+msgstr ""
 
 #: scripts/update-alternatives.pl:135
 #, perl-format
@@ -5065,92 +5066,92 @@ msgid ""
 "alternatives."
 msgstr "找不到指向 %2$s 的替换项 %1$s。正从替换项列表中移除。"
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - 状态为 %s"
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr " 链接目前指向 %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr " 链接目前不存在"
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr " 链接无法读取 - %s"
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - 优先级 %s"
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr " slave %s：%s"
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 msgid "No versions available."
 msgstr "无适用版本。"
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "目前“最佳”的版本为 %s。"
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "无法识别的参数 “%s”"
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install 需要 <link> <name> <path> <priority>"
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr "优先级必须为整数"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s 需要 <name> <path>"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s 需要 <name>"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave 需要 <link> <name> <path>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "次要名称(slave name) %s 有重复"
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "次要链接(slave link) %s 有重复"
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "文件名 %s 同時是主要(primary)和次要(slave)"
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "链接 %s 同時是主要(primary)和次要(slave)"
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5158,31 +5159,31 @@ msgstr ""
 "需要 --display, --config, --set, --install, --remove, --all, --remove-all 或 "
 "--auto 选项"
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr "--slave 只能搭配 --install 使用"
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "无 %s 的替换项。"
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "正在设置 %s 的自動选择"
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "无法移除 %s：%s"
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5191,7 +5192,7 @@ msgstr ""
 "%s 已更改（由于手动更改或通过脚本）。\n"
 "切换成只允许手动更新。"
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5200,67 +5201,67 @@ msgstr ""
 "检查 %s 的可用版本，正在更新 %s 中的链接…\n"
 "（如果愿意，你也可以自行修改符号链接 (symlink) - 请参阅 “man ln”。）"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "正在更改链接 %s 的名称，从 %s 改成 %s。"
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "无法把 %s 改名为 %s：%s"
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "次要链接名称 %s 已重复"
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "正在更改次要链接 %s 的名称，从 %s 改成 %s。"
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "正在移除手动选择的替代项 - 切换为自动模式"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "%2$s 的替换项 %1$s 没有注册，无法移除。"
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "舍弃已废弃的次要链接 %s（%s）。"
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "取消 %s 的自动更新功能。"
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr "要回复成自动更新，请执行 “update-alternatives --auto %s”。"
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "正在从上一次更新 %s 的失败中恢复…"
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "无法打开文件 “%s” 以写入：%s"
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "最后一个提供 %s（%s）的软件包已移除，删除中。"
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5269,38 +5270,38 @@ msgstr ""
 "警告：%s 应该是指向 %s 的符号链接(symlink)\n"
 " （或者不存在），但读取链接失败：%s"
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "无法确认 %s 不存在：%s"
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "无法创建 %s 为 %s 的符号链接(symlink)：%s"
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "无法把 %s 安装为 %s：%s"
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "维持 %s（%s）指向 %s。"
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "正在更新 %s（%s）指向 %s。"
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5309,13 +5310,13 @@ msgstr ""
 "警告：%s 本该是指向 %s 的次要链接，\n"
 "或者不存在；但读取链接失败：%s"
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "正在移除 %s（%s），不适用于 %s。"
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5324,7 +5325,7 @@ msgstr ""
 "只有一个程序提供 %s\n"
 "（%s）。无须做任何配置。\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5333,7 +5334,7 @@ msgstr ""
 "只有一个程序提供 %s\n"
 "（%s）。无须做任何配置。\n"
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5346,45 +5347,51 @@ msgstr ""
 "    选择        可选项\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr "要维持缺省值[*]，按回车键，或者键入选择的编号："
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "使用 “%s” 来提供 “%s”。"
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "找不到替换项 “%s”。"
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "写入标准输出(stdout)时出错：%s"
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "update-alternatives 文件（%s）禁止换行符"
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "%2$s：读取 %1$s 时发生错误或是 eof （%3$s）"
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, perl-format
 msgid "missing newline after %s"
 msgstr "在 %s 后缺少换行符"
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "严重问题：%s"
 
+#~ msgid "two modes specified: %s and --%s"
+#~ msgstr "指定了两种模式：%s 以及 --%s"
+
+#~ msgid "manflag"
+#~ msgstr "manflag"
+
 #~ msgid "%s: failed to exec gzip -dc"
 #~ msgstr "%s：exec gzip -dc 失败"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b1c0abce..c5d3fe56 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: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:52+0300\n"
 "PO-Revision-Date: 2006-10-16 21:31+0800\n"
 "Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -4307,7 +4307,7 @@ msgid "unable to close %s after read: %s"
 msgstr "讀取完畢：%s 後，無法關閉該檔案 %s"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:525
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "無法關閉 %s：%s"
@@ -4397,9 +4397,10 @@ msgstr ""
 "Package preinst/postrm scripts should always specify --package and --"
 "divert.\n"
 
-#: scripts/dpkg-divert.pl:78 scripts/update-alternatives.pl:223
-#, perl-format
-msgid "two modes specified: %s and --%s"
+#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
+#: scripts/update-alternatives.pl:233
+#, fuzzy, perl-format
+msgid "two commands specified: %s and --%s"
 msgstr "指定兩種模式：%s 以及 --%s"
 
 #: scripts/dpkg-divert.pl:111
@@ -4421,13 +4422,13 @@ msgid "package may not contain newlines"
 msgstr "套件可能不含有新的行數"
 
 #: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:272 scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s 需要一個<目錄名>作為參數"
 
 #: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:280
+#: scripts/update-alternatives.pl:290
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "無法識別的選項“%s”"
@@ -4580,7 +4581,7 @@ msgstr "建立新的diversions-old：%s"
 msgid "install new diversions: %s"
 msgstr "安裝新的轉移項目(diversions)：%s"
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:727
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "內部錯誤：%s 損毀：%s"
@@ -5034,8 +5035,8 @@ msgstr ""
 "  --version                show the version.\n"
 
 #: scripts/update-alternatives.pl:131
-msgid "manflag"
-msgstr "manflag"
+msgid "invalid update mode"
+msgstr ""
 
 #: scripts/update-alternatives.pl:135
 #, perl-format
@@ -5069,92 +5070,92 @@ msgid ""
 "alternatives."
 msgstr "找不到指向 %2$s 的替換項目 %1$s。從替換項目列表中移除。"
 
-#: scripts/update-alternatives.pl:187
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid "%s - status is %s."
 msgstr "%s - 狀態 %s。"
 
-#: scripts/update-alternatives.pl:191
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link currently points to %s"
 msgstr "目前的鏈結指向 %s"
 
-#: scripts/update-alternatives.pl:193
+#: scripts/update-alternatives.pl:202
 msgid " link currently absent"
 msgstr "鏈結失效"
 
-#: scripts/update-alternatives.pl:195
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid " link unreadable - %s"
 msgstr "鏈結無法解讀 - %s"
 
-#: scripts/update-alternatives.pl:199
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid "%s - priority %s"
 msgstr "%s - 優先權 %s"
 
-#: scripts/update-alternatives.pl:203
+#: scripts/update-alternatives.pl:212
 #, perl-format
 msgid " slave %s: %s"
 msgstr " slave %s: %s"
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:217
 msgid "No versions available."
 msgstr "無任何版本。"
 
-#: scripts/update-alternatives.pl:210
+#: scripts/update-alternatives.pl:219
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr "目前“最佳”的版本 %s"
 
-#: scripts/update-alternatives.pl:237
+#: scripts/update-alternatives.pl:247
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "無法識別參數“%s”"
 
-#: scripts/update-alternatives.pl:250
+#: scripts/update-alternatives.pl:260
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install 需要 <link> <name> <path> <priority>"
 
-#: scripts/update-alternatives.pl:252
+#: scripts/update-alternatives.pl:262
 msgid "priority must be an integer"
 msgstr "優先權必須是數字"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:266
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s 需要名稱<name> 路徑<path>"
 
-#: scripts/update-alternatives.pl:261
+#: scripts/update-alternatives.pl:271
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s 需要 <參數>"
 
-#: scripts/update-alternatives.pl:265
+#: scripts/update-alternatives.pl:275
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave 需有 <link> <name> <path>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:277
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "次要名稱 %s 已重覆"
 
-#: scripts/update-alternatives.pl:268
+#: scripts/update-alternatives.pl:278
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "次要鏈結 %s 已重覆"
 
-#: scripts/update-alternatives.pl:285
+#: scripts/update-alternatives.pl:295
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "檔名 %s 是主要也是次要"
 
-#: scripts/update-alternatives.pl:287
+#: scripts/update-alternatives.pl:297
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "鏈結 %s 是主要也是次要"
 
-#: scripts/update-alternatives.pl:289
+#: scripts/update-alternatives.pl:300
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5162,31 +5163,31 @@ msgstr ""
 "需要 --display, --config, --set, --install, --remove, --all, --remove-all 或 "
 "--auto 選項"
 
-#: scripts/update-alternatives.pl:290
+#: scripts/update-alternatives.pl:302
 msgid "--slave only allowed with --install"
 msgstr "--slave 只能搭配 --install 使用"
 
-#: scripts/update-alternatives.pl:303
+#: scripts/update-alternatives.pl:315
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "無 %s 的替換檔案。"
 
-#: scripts/update-alternatives.pl:350
+#: scripts/update-alternatives.pl:362
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "正在設定 %s 的自選功能。"
 
-#: scripts/update-alternatives.pl:353 scripts/update-alternatives.pl:355
-#: scripts/update-alternatives.pl:467 scripts/update-alternatives.pl:469
-#: scripts/update-alternatives.pl:532 scripts/update-alternatives.pl:534
-#: scripts/update-alternatives.pl:536 scripts/update-alternatives.pl:538
-#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:601
-#: scripts/update-alternatives.pl:674 scripts/update-alternatives.pl:710
+#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
+#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
+#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
+#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr "無法移除 %s：%s"
 
-#: scripts/update-alternatives.pl:366
+#: scripts/update-alternatives.pl:378
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5195,7 +5196,7 @@ msgstr ""
 "%s 已更動(手動更改或透過script)。\n"
 "切換成手動更新。"
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:390
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5204,67 +5205,67 @@ msgstr ""
 "檢查 %s 可安裝的版本，更新 %s 鏈結中…\n"
 "(你也可以依照自已的喜好來修改鏈結 - 請參閱“man ln”。)"
 
-#: scripts/update-alternatives.pl:384
+#: scripts/update-alternatives.pl:396
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "正在更名 %s 鏈結，%s 更名成 %s。"
 
-#: scripts/update-alternatives.pl:387 scripts/update-alternatives.pl:411
-#: scripts/update-alternatives.pl:493 scripts/update-alternatives.pl:569
+#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "%s無法更名成%s：%s"
 
-#: scripts/update-alternatives.pl:406
+#: scripts/update-alternatives.pl:418
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "次要鏈結名稱 %s 已重覆"
 
-#: scripts/update-alternatives.pl:408
+#: scripts/update-alternatives.pl:420
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "%s 次要鏈結更名中，%s 更名為 %s"
 
-#: scripts/update-alternatives.pl:423
+#: scripts/update-alternatives.pl:437
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "移除手動選擇的替代指令 - 切換為自動模式"
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:451
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "%2$s 的替換項目 %1$s 沒有註冊，無法移除。"
 
-#: scripts/update-alternatives.pl:464
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "捨棄無效的鏈結 %s(%s)。"
 
-#: scripts/update-alternatives.pl:485
+#: scripts/update-alternatives.pl:499
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "取消 %s 自動更新功能。"
 
-#: scripts/update-alternatives.pl:487
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr "要回復成自動更新，執行“update-alternatives --auto %s”。"
 
-#: scripts/update-alternatives.pl:491
+#: scripts/update-alternatives.pl:505
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "%s 回復成更新前的狀態…"
 
-#: scripts/update-alternatives.pl:506
+#: scripts/update-alternatives.pl:520
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "無法開啟 %s 檔案以供寫入：%s"
 
-#: scripts/update-alternatives.pl:529
+#: scripts/update-alternatives.pl:543
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "最後一個提供 %s(%s) 的套件已移除，刪除中。"
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:557
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
@@ -5273,38 +5274,38 @@ msgstr ""
 "警告：%s可能是%s的鏈結\n"
 "(或者不存在)；讀取鏈結失敗：%s"
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
+#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "無法確認%s是否存在：%s"
 
-#: scripts/update-alternatives.pl:551 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:660
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
+#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
+#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "無法建立 %2s 的鏈結 %1s：%3s"
 
-#: scripts/update-alternatives.pl:553 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:590 scripts/update-alternatives.pl:613
-#: scripts/update-alternatives.pl:662 scripts/update-alternatives.pl:698
-#: scripts/update-alternatives.pl:740
+#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
+#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "無法把“%s”安裝到“%s”：%s"
 
-#: scripts/update-alternatives.pl:556 scripts/update-alternatives.pl:604
+#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr "Leaving %s (%s) pointing to %s."
 
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:607
+#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr "正在更新 %s(%s)並指向 %s。"
 
-#: scripts/update-alternatives.pl:580
+#: scripts/update-alternatives.pl:594
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
@@ -5313,13 +5314,13 @@ msgstr ""
 "警告：%s可能是%s的次要鏈結\n"
 "，或者不存在；讀取鏈結失敗：%s"
 
-#: scripts/update-alternatives.pl:596 scripts/update-alternatives.pl:671
-#: scripts/update-alternatives.pl:707
+#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
+#: scripts/update-alternatives.pl:721
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr "正在移除 %s(%s)中，不適用於%s。"
 
-#: scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:635
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5328,7 +5329,7 @@ msgstr ""
 "只有一個程式提供 %s\n"
 "(%s)。無須做任何設定。\n"
 
-#: scripts/update-alternatives.pl:627
+#: scripts/update-alternatives.pl:641
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5337,7 +5338,7 @@ msgstr ""
 "只有一個程式提供 %s\n"
 "(%s)。無須做任何設定。\n"
 
-#: scripts/update-alternatives.pl:632
+#: scripts/update-alternatives.pl:646
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5350,45 +5351,51 @@ msgstr ""
 "  可使用的替換項目\n"
 "===========================\n"
 
-#: scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:656
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr "按下 enter 來指定預設選項[*]，或者輸入選擇的號碼："
 
-#: scripts/update-alternatives.pl:657 scripts/update-alternatives.pl:694
+#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr "以“%1s”取代 “%2s”"
 
-#: scripts/update-alternatives.pl:692
+#: scripts/update-alternatives.pl:706
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "找不到替換檔案“%s”。"
 
-#: scripts/update-alternatives.pl:715 scripts/update-alternatives.pl:718
+#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "%s寫入錯誤"
 
-#: scripts/update-alternatives.pl:717
+#: scripts/update-alternatives.pl:731
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "newlines prohibited in update-alternatives files (%s)"
 
-#: scripts/update-alternatives.pl:722
+#: scripts/update-alternatives.pl:736
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "%2$s：發生錯誤或是讀到檔案%1$s尾端(%3$s)"
 
-#: scripts/update-alternatives.pl:723
+#: scripts/update-alternatives.pl:737
 #, perl-format
 msgid "missing newline after %s"
 msgstr "在%s後沒有發現換行字元"
 
-#: scripts/update-alternatives.pl:743
+#: scripts/update-alternatives.pl:757
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "嚴重的問題：%s"
 
+#~ msgid "two modes specified: %s and --%s"
+#~ msgstr "指定兩種模式：%s 以及 --%s"
+
+#~ msgid "manflag"
+#~ msgstr "manflag"
+
 #~ msgid "%s: failed to exec gzip -dc"
 #~ msgstr "%s：執行 gzip -dc 失敗"
 
diff --git a/scripts/po/ChangeLog b/scripts/po/ChangeLog
index c1f9ee56..2204a5eb 100644
--- a/scripts/po/ChangeLog
+++ b/scripts/po/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-15  Guillem Jover  <guillem@debian.org>
+
+	* dpkg-dev.pot: Regenerated.
+	* *.po: Merged with dpkg-dev.pot.
+
 2007-05-11  Frédéric Bothamy  <frederic.bothamy@free.fr>
 
 	* fr.po: Typo corrected (s/-O/-0).
diff --git a/scripts/po/ca.po b/scripts/po/ca.po
index 664ec244..1c00c45c 100644
--- a/scripts/po/ca.po
+++ b/scripts/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:56+0300\n"
 "PO-Revision-Date: 2006-12-04 13:59+0100\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -54,194 +54,194 @@ msgstr ""
 msgid "unable to open triplettable"
 msgstr ""
 
-#: scripts/controllib.pl:313
+#: scripts/controllib.pl:315
 #, perl-format
 msgid "too many substitutions - recursive ? - in `%s'"
 msgstr ""
 
-#: scripts/controllib.pl:319
+#: scripts/controllib.pl:321
 #, perl-format
 msgid "unknown substitution variable ${%s}"
 msgstr "la variable de substitució ${%s} és desconeguda"
 
-#: scripts/controllib.pl:364
+#: scripts/controllib.pl:366
 #, perl-format
 msgid "field %s has newline then non whitespace >%s<"
 msgstr ""
 
-#: scripts/controllib.pl:365
+#: scripts/controllib.pl:367
 #, perl-format
 msgid "field %s has blank lines >%s<"
 msgstr ""
 
-#: scripts/controllib.pl:366
+#: scripts/controllib.pl:368
 #, perl-format
 msgid "field %s has trailing newline >%s<"
 msgstr ""
 
-#: scripts/controllib.pl:373
+#: scripts/controllib.pl:375
 msgid "write error on control data"
 msgstr ""
 
-#: scripts/controllib.pl:376
+#: scripts/controllib.pl:378
 msgid "write error on close control data"
 msgstr ""
 
-#: scripts/controllib.pl:384
+#: scripts/controllib.pl:386
 #, perl-format
 msgid "cannot read control file %s: %s"
 msgstr ""
 
-#: scripts/controllib.pl:387
+#: scripts/controllib.pl:389
 #, perl-format
 msgid "control file %s"
 msgstr ""
 
-#: scripts/controllib.pl:388
+#: scripts/controllib.pl:390
 msgid "control file must have at least one binary package part"
 msgstr ""
 
-#: scripts/controllib.pl:392
+#: scripts/controllib.pl:394
 #, perl-format
 msgid "per-package paragraph %d in control info file is missing Package line"
 msgstr ""
 
-#: scripts/controllib.pl:397
+#: scripts/controllib.pl:399
 msgid "source paragraph in control info file is missing Source line"
 msgstr ""
 
-#: scripts/controllib.pl:414
+#: scripts/controllib.pl:416
 #, perl-format
 msgid "bad line in substvars file %s at line %d"
 msgstr ""
 
-#: scripts/controllib.pl:420
+#: scripts/controllib.pl:422
 #, perl-format
 msgid "unable to open substvars file %s: %s"
 msgstr ""
 
-#: scripts/controllib.pl:472
+#: scripts/controllib.pl:474
 #, perl-format
 msgid "can't parse dependency %s"
 msgstr ""
 
-#: scripts/controllib.pl:499
+#: scripts/controllib.pl:501
 msgid "fork for parse changelog"
 msgstr ""
 
-#: scripts/controllib.pl:502 scripts/dpkg-genchanges.pl:276
-#: scripts/dpkg-gencontrol.pl:209 scripts/dpkg-source.pl:303
+#: scripts/controllib.pl:504 scripts/dpkg-genchanges.pl:274
+#: scripts/dpkg-gencontrol.pl:207 scripts/dpkg-source.pl:303
 msgid "parsed version of changelog"
 msgstr ""
 
-#: scripts/controllib.pl:504
+#: scripts/controllib.pl:506
 msgid "parse changelog"
 msgstr ""
 
-#: scripts/controllib.pl:545
+#: scripts/controllib.pl:547
 #, perl-format
 msgid "source package name `%s' contains illegal character `%s'"
 msgstr ""
 
-#: scripts/controllib.pl:547
+#: scripts/controllib.pl:549
 #, perl-format
 msgid "source package name `%s' starts with non-alphanum"
 msgstr ""
 
-#: scripts/controllib.pl:553
+#: scripts/controllib.pl:555
 #, perl-format
 msgid "version number contains illegal character `%s'"
 msgstr ""
 
-#: scripts/controllib.pl:562
+#: scripts/controllib.pl:564
 #, perl-format
 msgid "source package has two conflicting values - %s and %s"
 msgstr ""
 
-#: scripts/controllib.pl:571
+#: scripts/controllib.pl:573
 #, perl-format
 msgid "md5sum gave bogus output `%s'"
 msgstr ""
 
-#: scripts/controllib.pl:603
+#: scripts/controllib.pl:605
 msgid "continued value line not in field"
 msgstr ""
 
-#: scripts/controllib.pl:606
+#: scripts/controllib.pl:608
 msgid "expected blank line before PGP signature"
 msgstr ""
 
-#: scripts/controllib.pl:618
+#: scripts/controllib.pl:620
 msgid "expected PGP signature, found EOF after blank line"
 msgstr ""
 
-#: scripts/controllib.pl:621
+#: scripts/controllib.pl:623
 #, perl-format
 msgid "expected PGP signature, found something else `%s'"
 msgstr ""
 
-#: scripts/controllib.pl:626
+#: scripts/controllib.pl:628
 msgid "found several `paragraphs' where only one expected"
 msgstr ""
 
-#: scripts/controllib.pl:630
+#: scripts/controllib.pl:632
 msgid "line with unknown format (not field-colon-value)"
 msgstr ""
 
-#: scripts/controllib.pl:633
+#: scripts/controllib.pl:635
 msgid "found start of PGP body but no signature"
 msgstr ""
 
-#: scripts/controllib.pl:635
+#: scripts/controllib.pl:637
 msgid "empty file"
 msgstr ""
 
-#: scripts/controllib.pl:641
+#: scripts/controllib.pl:643
 #, perl-format
 msgid "unknown information field '%s' in input data in %s"
 msgstr ""
 
-#: scripts/controllib.pl:646
+#: scripts/controllib.pl:648
 #, perl-format
 msgid "syntax error in %s at line %d: %s"
 msgstr ""
 
-#: scripts/controllib.pl:649
+#: scripts/controllib.pl:651
 #, perl-format
 msgid "%s: failure: %s"
 msgstr ""
 
-#: scripts/controllib.pl:650
+#: scripts/controllib.pl:652
 #, perl-format
 msgid "%s: failure: %s: %s"
 msgstr ""
 
-#: scripts/controllib.pl:651
+#: scripts/controllib.pl:653
 #, perl-format
 msgid "%s: error: %s"
 msgstr "%s: error: %s"
 
-#: scripts/controllib.pl:652
+#: scripts/controllib.pl:654
 #, perl-format
 msgid "%s: internal error: %s"
 msgstr "%s: error intern: %s"
 
-#: scripts/controllib.pl:657
+#: scripts/controllib.pl:659
 #, perl-format
 msgid "%s: warning: %s"
 msgstr "%s: avís: %s"
 
-#: scripts/controllib.pl:681
+#: scripts/controllib.pl:683
 #, perl-format
 msgid "%s: failure: %s gave error exit status %s"
 msgstr ""
 
-#: scripts/controllib.pl:684
+#: scripts/controllib.pl:686
 #, perl-format
 msgid "%s: failure: %s died from signal %s"
 msgstr ""
 
-#: scripts/controllib.pl:687
+#: scripts/controllib.pl:689
 #, perl-format
 msgid "%s: failure: %s failed with unknown exit code %d"
 msgstr ""
@@ -376,7 +376,7 @@ msgstr "%s: Dependències de construcció no satisfetes: "
 msgid "%s: Build conflicts: "
 msgstr "%s: Conflictes de construcció: "
 
-#: scripts/dpkg-checkbuilddeps.pl:155 scripts/dpkg-gencontrol.pl:230
+#: scripts/dpkg-checkbuilddeps.pl:155 scripts/dpkg-gencontrol.pl:228
 #: scripts/dpkg-source.pl:247
 #, perl-format
 msgid "error occurred while parsing %s"
@@ -409,27 +409,27 @@ msgstr ""
 msgid "filename, section and priority may contain no whitespace"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:67 scripts/dpkg-gencontrol.pl:294
+#: scripts/dpkg-distaddfile.pl:67 scripts/dpkg-gencontrol.pl:292
 msgid "open new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:69 scripts/dpkg-gencontrol.pl:297
+#: scripts/dpkg-distaddfile.pl:69 scripts/dpkg-gencontrol.pl:295
 msgid "chown new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:74 scripts/dpkg-gencontrol.pl:306
+#: scripts/dpkg-distaddfile.pl:74 scripts/dpkg-gencontrol.pl:304
 msgid "copy old entry to new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:77 scripts/dpkg-gencontrol.pl:310
+#: scripts/dpkg-distaddfile.pl:77 scripts/dpkg-gencontrol.pl:308
 msgid "read old files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:80 scripts/dpkg-gencontrol.pl:318
+#: scripts/dpkg-distaddfile.pl:80 scripts/dpkg-gencontrol.pl:316
 msgid "write new entry to new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:81 scripts/dpkg-gencontrol.pl:319
+#: scripts/dpkg-distaddfile.pl:81 scripts/dpkg-gencontrol.pl:317
 msgid "close new files list file"
 msgstr ""
 
@@ -507,132 +507,132 @@ msgstr ""
 msgid "general section of control info file"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:227
+#: scripts/dpkg-genchanges.pl:226
 #, perl-format
 msgid "package %s in control file but not in files list"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:263 scripts/dpkg-gencontrol.pl:194
+#: scripts/dpkg-genchanges.pl:261 scripts/dpkg-gencontrol.pl:192
 #: scripts/dpkg-source.pl:290
 msgid "package's section of control info file"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:280 scripts/dpkg-gencontrol.pl:213
+#: scripts/dpkg-genchanges.pl:278 scripts/dpkg-gencontrol.pl:211
 #: scripts/dpkg-source.pl:307
 #, perl-format
 msgid "value from nowhere, with key >%s< and value >%s<"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:287
+#: scripts/dpkg-genchanges.pl:285
 msgid "read changesdescription"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:298
+#: scripts/dpkg-genchanges.pl:296
 #, perl-format
 msgid "package %s listed in files list but not in control info"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:308
+#: scripts/dpkg-genchanges.pl:306
 #, perl-format
 msgid "missing Section for binary package %s; using '-'"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:310
+#: scripts/dpkg-genchanges.pl:308
 #, perl-format
 msgid "package %s has section %s in control file but %s in files list"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:317
+#: scripts/dpkg-genchanges.pl:315
 #, perl-format
 msgid "missing Priority for binary package %s; using '-'"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:319
+#: scripts/dpkg-genchanges.pl:317
 #, perl-format
 msgid "package %s has priority %s in control file but %s in files list"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:333
+#: scripts/dpkg-genchanges.pl:331
 msgid "missing Section for source files"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:338
+#: scripts/dpkg-genchanges.pl:336
 msgid "missing Priority for source files"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:343 scripts/dpkg-source.pl:678
+#: scripts/dpkg-genchanges.pl:341 scripts/dpkg-source.pl:678
 #: scripts/dpkg-source.pl:708
 #, perl-format
 msgid "cannot open .dsc file %s: %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:346 scripts/dpkg-source.pl:709
+#: scripts/dpkg-genchanges.pl:344 scripts/dpkg-source.pl:709
 #, perl-format
 msgid "source control file %s"
 msgstr "fitxer de control font %s"
 
-#: scripts/dpkg-genchanges.pl:352 scripts/dpkg-source.pl:748
+#: scripts/dpkg-genchanges.pl:350 scripts/dpkg-source.pl:748
 #, perl-format
 msgid "Files field contains bad line `%s'"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:364
+#: scripts/dpkg-genchanges.pl:362
 msgid "not including original source code in upload"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:368
+#: scripts/dpkg-genchanges.pl:366
 msgid "ignoring -sd option for native Debian package"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:370
+#: scripts/dpkg-genchanges.pl:368
 msgid "including full source code in upload"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:373
+#: scripts/dpkg-genchanges.pl:371
 msgid "binary-only upload - not including any source code"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:377
+#: scripts/dpkg-genchanges.pl:375
 msgid "write original source message"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:402
+#: scripts/dpkg-genchanges.pl:400
 #, perl-format
 msgid "cannot open upload file %s for reading"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:403
+#: scripts/dpkg-genchanges.pl:401
 #, perl-format
 msgid "cannot fstat upload file %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:405
+#: scripts/dpkg-genchanges.pl:403
 #, perl-format
 msgid "upload file %s is empty"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:407
+#: scripts/dpkg-genchanges.pl:405
 #, perl-format
 msgid "md5sum upload file %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:409
+#: scripts/dpkg-genchanges.pl:407
 #, perl-format
 msgid "md5sum upload file %s gave strange output `%s'"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:412
+#: scripts/dpkg-genchanges.pl:410
 #, perl-format
 msgid "md5sum of source file %s (%s) is different from md5sum in %s (%s)"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:427 scripts/dpkg-source.pl:317
+#: scripts/dpkg-genchanges.pl:425 scripts/dpkg-source.pl:317
 #, perl-format
 msgid "missing information for critical output field %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:431 scripts/dpkg-gencontrol.pl:251
-#: scripts/dpkg-gencontrol.pl:254 scripts/dpkg-source.pl:321
+#: scripts/dpkg-genchanges.pl:429 scripts/dpkg-gencontrol.pl:249
+#: scripts/dpkg-gencontrol.pl:252 scripts/dpkg-source.pl:321
 #, perl-format
 msgid "missing information for output field %s"
 msgstr "manca informació per al camp d'eixida %s"
@@ -683,55 +683,55 @@ msgstr "el paquet %s no és a la informació de control"
 msgid "must specify package since control info has many (%s)"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:180
+#: scripts/dpkg-gencontrol.pl:178
 #, perl-format
 msgid "`%s' is not a legal architecture string."
 msgid_plural "`%s' are not legal architecture strings."
 msgstr[0] ""
 msgstr[1] ""
 
-#: scripts/dpkg-gencontrol.pl:186
+#: scripts/dpkg-gencontrol.pl:184
 #, perl-format
 msgid "current build architecture %s does not appear in package's list (%s)"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:266
+#: scripts/dpkg-gencontrol.pl:264
 msgid "fork for du"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:268
+#: scripts/dpkg-gencontrol.pl:266
 #, perl-format
 msgid "chdir for du to `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:269
+#: scripts/dpkg-gencontrol.pl:267
 msgid "exec du"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:275
+#: scripts/dpkg-gencontrol.pl:273
 #, perl-format
 msgid "du in `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:276
+#: scripts/dpkg-gencontrol.pl:274
 #, perl-format
 msgid "du gave unexpected output `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:308
+#: scripts/dpkg-gencontrol.pl:306
 msgid "close old files list file"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:320
+#: scripts/dpkg-gencontrol.pl:318
 msgid "install new files list file"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:327
+#: scripts/dpkg-gencontrol.pl:325
 #, perl-format
 msgid "cannot open new output control file `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:335
+#: scripts/dpkg-gencontrol.pl:333
 #, perl-format
 msgid "cannot install output control file `%s'"
 msgstr ""
diff --git a/scripts/po/dpkg-dev.pot b/scripts/po/dpkg-dev.pot
index 6f0cba19..f0968bdf 100644
--- a/scripts/po/dpkg-dev.pot
+++ b/scripts/po/dpkg-dev.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: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:56+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"
@@ -53,194 +53,194 @@ msgstr ""
 msgid "unable to open triplettable"
 msgstr ""
 
-#: scripts/controllib.pl:313
+#: scripts/controllib.pl:315
 #, perl-format
 msgid "too many substitutions - recursive ? - in `%s'"
 msgstr ""
 
-#: scripts/controllib.pl:319
+#: scripts/controllib.pl:321
 #, perl-format
 msgid "unknown substitution variable ${%s}"
 msgstr ""
 
-#: scripts/controllib.pl:364
+#: scripts/controllib.pl:366
 #, perl-format
 msgid "field %s has newline then non whitespace >%s<"
 msgstr ""
 
-#: scripts/controllib.pl:365
+#: scripts/controllib.pl:367
 #, perl-format
 msgid "field %s has blank lines >%s<"
 msgstr ""
 
-#: scripts/controllib.pl:366
+#: scripts/controllib.pl:368
 #, perl-format
 msgid "field %s has trailing newline >%s<"
 msgstr ""
 
-#: scripts/controllib.pl:373
+#: scripts/controllib.pl:375
 msgid "write error on control data"
 msgstr ""
 
-#: scripts/controllib.pl:376
+#: scripts/controllib.pl:378
 msgid "write error on close control data"
 msgstr ""
 
-#: scripts/controllib.pl:384
+#: scripts/controllib.pl:386
 #, perl-format
 msgid "cannot read control file %s: %s"
 msgstr ""
 
-#: scripts/controllib.pl:387
+#: scripts/controllib.pl:389
 #, perl-format
 msgid "control file %s"
 msgstr ""
 
-#: scripts/controllib.pl:388
+#: scripts/controllib.pl:390
 msgid "control file must have at least one binary package part"
 msgstr ""
 
-#: scripts/controllib.pl:392
+#: scripts/controllib.pl:394
 #, perl-format
 msgid "per-package paragraph %d in control info file is missing Package line"
 msgstr ""
 
-#: scripts/controllib.pl:397
+#: scripts/controllib.pl:399
 msgid "source paragraph in control info file is missing Source line"
 msgstr ""
 
-#: scripts/controllib.pl:414
+#: scripts/controllib.pl:416
 #, perl-format
 msgid "bad line in substvars file %s at line %d"
 msgstr ""
 
-#: scripts/controllib.pl:420
+#: scripts/controllib.pl:422
 #, perl-format
 msgid "unable to open substvars file %s: %s"
 msgstr ""
 
-#: scripts/controllib.pl:472
+#: scripts/controllib.pl:474
 #, perl-format
 msgid "can't parse dependency %s"
 msgstr ""
 
-#: scripts/controllib.pl:499
+#: scripts/controllib.pl:501
 msgid "fork for parse changelog"
 msgstr ""
 
-#: scripts/controllib.pl:502 scripts/dpkg-genchanges.pl:276
-#: scripts/dpkg-gencontrol.pl:209 scripts/dpkg-source.pl:303
+#: scripts/controllib.pl:504 scripts/dpkg-genchanges.pl:274
+#: scripts/dpkg-gencontrol.pl:207 scripts/dpkg-source.pl:303
 msgid "parsed version of changelog"
 msgstr ""
 
-#: scripts/controllib.pl:504
+#: scripts/controllib.pl:506
 msgid "parse changelog"
 msgstr ""
 
-#: scripts/controllib.pl:545
+#: scripts/controllib.pl:547
 #, perl-format
 msgid "source package name `%s' contains illegal character `%s'"
 msgstr ""
 
-#: scripts/controllib.pl:547
+#: scripts/controllib.pl:549
 #, perl-format
 msgid "source package name `%s' starts with non-alphanum"
 msgstr ""
 
-#: scripts/controllib.pl:553
+#: scripts/controllib.pl:555
 #, perl-format
 msgid "version number contains illegal character `%s'"
 msgstr ""
 
-#: scripts/controllib.pl:562
+#: scripts/controllib.pl:564
 #, perl-format
 msgid "source package has two conflicting values - %s and %s"
 msgstr ""
 
-#: scripts/controllib.pl:571
+#: scripts/controllib.pl:573
 #, perl-format
 msgid "md5sum gave bogus output `%s'"
 msgstr ""
 
-#: scripts/controllib.pl:603
+#: scripts/controllib.pl:605
 msgid "continued value line not in field"
 msgstr ""
 
-#: scripts/controllib.pl:606
+#: scripts/controllib.pl:608
 msgid "expected blank line before PGP signature"
 msgstr ""
 
-#: scripts/controllib.pl:618
+#: scripts/controllib.pl:620
 msgid "expected PGP signature, found EOF after blank line"
 msgstr ""
 
-#: scripts/controllib.pl:621
+#: scripts/controllib.pl:623
 #, perl-format
 msgid "expected PGP signature, found something else `%s'"
 msgstr ""
 
-#: scripts/controllib.pl:626
+#: scripts/controllib.pl:628
 msgid "found several `paragraphs' where only one expected"
 msgstr ""
 
-#: scripts/controllib.pl:630
+#: scripts/controllib.pl:632
 msgid "line with unknown format (not field-colon-value)"
 msgstr ""
 
-#: scripts/controllib.pl:633
+#: scripts/controllib.pl:635
 msgid "found start of PGP body but no signature"
 msgstr ""
 
-#: scripts/controllib.pl:635
+#: scripts/controllib.pl:637
 msgid "empty file"
 msgstr ""
 
-#: scripts/controllib.pl:641
+#: scripts/controllib.pl:643
 #, perl-format
 msgid "unknown information field '%s' in input data in %s"
 msgstr ""
 
-#: scripts/controllib.pl:646
+#: scripts/controllib.pl:648
 #, perl-format
 msgid "syntax error in %s at line %d: %s"
 msgstr ""
 
-#: scripts/controllib.pl:649
+#: scripts/controllib.pl:651
 #, perl-format
 msgid "%s: failure: %s"
 msgstr ""
 
-#: scripts/controllib.pl:650
+#: scripts/controllib.pl:652
 #, perl-format
 msgid "%s: failure: %s: %s"
 msgstr ""
 
-#: scripts/controllib.pl:651
+#: scripts/controllib.pl:653
 #, perl-format
 msgid "%s: error: %s"
 msgstr ""
 
-#: scripts/controllib.pl:652
+#: scripts/controllib.pl:654
 #, perl-format
 msgid "%s: internal error: %s"
 msgstr ""
 
-#: scripts/controllib.pl:657
+#: scripts/controllib.pl:659
 #, perl-format
 msgid "%s: warning: %s"
 msgstr ""
 
-#: scripts/controllib.pl:681
+#: scripts/controllib.pl:683
 #, perl-format
 msgid "%s: failure: %s gave error exit status %s"
 msgstr ""
 
-#: scripts/controllib.pl:684
+#: scripts/controllib.pl:686
 #, perl-format
 msgid "%s: failure: %s died from signal %s"
 msgstr ""
 
-#: scripts/controllib.pl:687
+#: scripts/controllib.pl:689
 #, perl-format
 msgid "%s: failure: %s failed with unknown exit code %d"
 msgstr ""
@@ -369,7 +369,7 @@ msgstr ""
 msgid "%s: Build conflicts: "
 msgstr ""
 
-#: scripts/dpkg-checkbuilddeps.pl:155 scripts/dpkg-gencontrol.pl:230
+#: scripts/dpkg-checkbuilddeps.pl:155 scripts/dpkg-gencontrol.pl:228
 #: scripts/dpkg-source.pl:247
 #, perl-format
 msgid "error occurred while parsing %s"
@@ -400,27 +400,27 @@ msgstr ""
 msgid "filename, section and priority may contain no whitespace"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:67 scripts/dpkg-gencontrol.pl:294
+#: scripts/dpkg-distaddfile.pl:67 scripts/dpkg-gencontrol.pl:292
 msgid "open new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:69 scripts/dpkg-gencontrol.pl:297
+#: scripts/dpkg-distaddfile.pl:69 scripts/dpkg-gencontrol.pl:295
 msgid "chown new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:74 scripts/dpkg-gencontrol.pl:306
+#: scripts/dpkg-distaddfile.pl:74 scripts/dpkg-gencontrol.pl:304
 msgid "copy old entry to new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:77 scripts/dpkg-gencontrol.pl:310
+#: scripts/dpkg-distaddfile.pl:77 scripts/dpkg-gencontrol.pl:308
 msgid "read old files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:80 scripts/dpkg-gencontrol.pl:318
+#: scripts/dpkg-distaddfile.pl:80 scripts/dpkg-gencontrol.pl:316
 msgid "write new entry to new files list file"
 msgstr ""
 
-#: scripts/dpkg-distaddfile.pl:81 scripts/dpkg-gencontrol.pl:319
+#: scripts/dpkg-distaddfile.pl:81 scripts/dpkg-gencontrol.pl:317
 msgid "close new files list file"
 msgstr ""
 
@@ -495,132 +495,132 @@ msgstr ""
 msgid "general section of control info file"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:227
+#: scripts/dpkg-genchanges.pl:226
 #, perl-format
 msgid "package %s in control file but not in files list"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:263 scripts/dpkg-gencontrol.pl:194
+#: scripts/dpkg-genchanges.pl:261 scripts/dpkg-gencontrol.pl:192
 #: scripts/dpkg-source.pl:290
 msgid "package's section of control info file"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:280 scripts/dpkg-gencontrol.pl:213
+#: scripts/dpkg-genchanges.pl:278 scripts/dpkg-gencontrol.pl:211
 #: scripts/dpkg-source.pl:307
 #, perl-format
 msgid "value from nowhere, with key >%s< and value >%s<"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:287
+#: scripts/dpkg-genchanges.pl:285
 msgid "read changesdescription"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:298
+#: scripts/dpkg-genchanges.pl:296
 #, perl-format
 msgid "package %s listed in files list but not in control info"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:308
+#: scripts/dpkg-genchanges.pl:306
 #, perl-format
 msgid "missing Section for binary package %s; using '-'"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:310
+#: scripts/dpkg-genchanges.pl:308
 #, perl-format
 msgid "package %s has section %s in control file but %s in files list"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:317
+#: scripts/dpkg-genchanges.pl:315
 #, perl-format
 msgid "missing Priority for binary package %s; using '-'"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:319
+#: scripts/dpkg-genchanges.pl:317
 #, perl-format
 msgid "package %s has priority %s in control file but %s in files list"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:333
+#: scripts/dpkg-genchanges.pl:331
 msgid "missing Section for source files"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:338
+#: scripts/dpkg-genchanges.pl:336
 msgid "missing Priority for source files"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:343 scripts/dpkg-source.pl:678
+#: scripts/dpkg-genchanges.pl:341 scripts/dpkg-source.pl:678
 #: scripts/dpkg-source.pl:708
 #, perl-format
 msgid "cannot open .dsc file %s: %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:346 scripts/dpkg-source.pl:709
+#: scripts/dpkg-genchanges.pl:344 scripts/dpkg-source.pl:709
 #, perl-format
 msgid "source control file %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:352 scripts/dpkg-source.pl:748
+#: scripts/dpkg-genchanges.pl:350 scripts/dpkg-source.pl:748
 #, perl-format
 msgid "Files field contains bad line `%s'"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:364
+#: scripts/dpkg-genchanges.pl:362
 msgid "not including original source code in upload"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:368
+#: scripts/dpkg-genchanges.pl:366
 msgid "ignoring -sd option for native Debian package"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:370
+#: scripts/dpkg-genchanges.pl:368
 msgid "including full source code in upload"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:373
+#: scripts/dpkg-genchanges.pl:371
 msgid "binary-only upload - not including any source code"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:377
+#: scripts/dpkg-genchanges.pl:375
 msgid "write original source message"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:402
+#: scripts/dpkg-genchanges.pl:400
 #, perl-format
 msgid "cannot open upload file %s for reading"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:403
+#: scripts/dpkg-genchanges.pl:401
 #, perl-format
 msgid "cannot fstat upload file %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:405
+#: scripts/dpkg-genchanges.pl:403
 #, perl-format
 msgid "upload file %s is empty"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:407
+#: scripts/dpkg-genchanges.pl:405
 #, perl-format
 msgid "md5sum upload file %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:409
+#: scripts/dpkg-genchanges.pl:407
 #, perl-format
 msgid "md5sum upload file %s gave strange output `%s'"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:412
+#: scripts/dpkg-genchanges.pl:410
 #, perl-format
 msgid "md5sum of source file %s (%s) is different from md5sum in %s (%s)"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:427 scripts/dpkg-source.pl:317
+#: scripts/dpkg-genchanges.pl:425 scripts/dpkg-source.pl:317
 #, perl-format
 msgid "missing information for critical output field %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:431 scripts/dpkg-gencontrol.pl:251
-#: scripts/dpkg-gencontrol.pl:254 scripts/dpkg-source.pl:321
+#: scripts/dpkg-genchanges.pl:429 scripts/dpkg-gencontrol.pl:249
+#: scripts/dpkg-gencontrol.pl:252 scripts/dpkg-source.pl:321
 #, perl-format
 msgid "missing information for output field %s"
 msgstr ""
@@ -671,55 +671,55 @@ msgstr ""
 msgid "must specify package since control info has many (%s)"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:180
+#: scripts/dpkg-gencontrol.pl:178
 #, perl-format
 msgid "`%s' is not a legal architecture string."
 msgid_plural "`%s' are not legal architecture strings."
 msgstr[0] ""
 msgstr[1] ""
 
-#: scripts/dpkg-gencontrol.pl:186
+#: scripts/dpkg-gencontrol.pl:184
 #, perl-format
 msgid "current build architecture %s does not appear in package's list (%s)"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:266
+#: scripts/dpkg-gencontrol.pl:264
 msgid "fork for du"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:268
+#: scripts/dpkg-gencontrol.pl:266
 #, perl-format
 msgid "chdir for du to `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:269
+#: scripts/dpkg-gencontrol.pl:267
 msgid "exec du"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:275
+#: scripts/dpkg-gencontrol.pl:273
 #, perl-format
 msgid "du in `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:276
+#: scripts/dpkg-gencontrol.pl:274
 #, perl-format
 msgid "du gave unexpected output `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:308
+#: scripts/dpkg-gencontrol.pl:306
 msgid "close old files list file"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:320
+#: scripts/dpkg-gencontrol.pl:318
 msgid "install new files list file"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:327
+#: scripts/dpkg-gencontrol.pl:325
 #, perl-format
 msgid "cannot open new output control file `%s'"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:335
+#: scripts/dpkg-gencontrol.pl:333
 #, perl-format
 msgid "cannot install output control file `%s'"
 msgstr ""
diff --git a/scripts/po/fr.po b/scripts/po/fr.po
index b2eb0354..335f38b0 100644
--- a/scripts/po/fr.po
+++ b/scripts/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg scripts\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-05-09 21:06+0300\n"
+"POT-Creation-Date: 2007-05-15 15:56+0300\n"
 "PO-Revision-Date: 2006-07-08 14:27+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -56,204 +56,204 @@ msgstr "impossible d'ouvrir ostable"
 msgid "unable to open triplettable"
 msgstr "impossible d'ouvrir cputable"
 
-#: scripts/controllib.pl:313
+#: scripts/controllib.pl:315
 #, perl-format
 msgid "too many substitutions - recursive ? - in `%s'"
 msgstr "trop de substitutions - mode récursif ? - dans « %s »"
 
-#: scripts/controllib.pl:319
+#: scripts/controllib.pl:321
 #, perl-format
 msgid "unknown substitution variable ${%s}"
 msgstr "variable de substitution inconnue ${%s}"
 
-#: scripts/controllib.pl:364
+#: scripts/controllib.pl:366
 #, perl-format
 msgid "field %s has newline then non whitespace >%s<"
 msgstr ""
 "le champ %s contient un caractère nouvelle ligne puis un caractère >%s<"
 
-#: scripts/controllib.pl:365
+#: scripts/controllib.pl:367
 #, perl-format
 msgid "field %s has blank lines >%s<"
 msgstr "le champ %s contient des lignes blanches >%s<"
 
-#: scripts/controllib.pl:366
+#: scripts/controllib.pl:368
 #, perl-format
 msgid "field %s has trailing newline >%s<"
 msgstr "le champ %s se termine par un caractère nouvelle ligne >%s<"
 
-#: scripts/controllib.pl:373
+#: scripts/controllib.pl:375
 msgid "write error on control data"
 msgstr "erreur d'écriture sur des données de contrôle"
 
-#: scripts/controllib.pl:376
+#: scripts/controllib.pl:378
 msgid "write error on close control data"
 msgstr "erreur d'écriture au moment de la fermeture des données de contrôle"
 
-#: scripts/controllib.pl:384
+#: scripts/controllib.pl:386
 #, perl-format
 msgid "cannot read control file %s: %s"
 msgstr "impossible de lire le fichier de contrôle %s : %s"
 
-#: scripts/controllib.pl:387
+#: scripts/controllib.pl:389
 #, perl-format
 msgid "control file %s"
 msgstr "fichier de contrôle %s"
 
-#: scripts/controllib.pl:388
+#: scripts/controllib.pl:390
 msgid "control file must have at least one binary package part"
 msgstr ""
 "le fichier de contrôle doit contenir au moins une partie concernant les "
 "paquets binaires"
 
-#: scripts/controllib.pl:392
+#: scripts/controllib.pl:394
 #, perl-format
 msgid "per-package paragraph %d in control info file is missing Package line"
 msgstr ""
 "il manque une ligne Package dans le paragraphe %d concernant les paquets "
 "dans le fichier de contrôle"
 
-#: scripts/controllib.pl:397
+#: scripts/controllib.pl:399
 msgid "source paragraph in control info file is missing Source line"
 msgstr ""
 "il manque une ligne Source dans le paragraphe concernant les sources dans le "
 "fichier de contrôle"
 
-#: scripts/controllib.pl:414
+#: scripts/controllib.pl:416
 #, perl-format
 msgid "bad line in substvars file %s at line %d"
 msgstr "fichier substvars %s : ligne %d mal formée"
 
-#: scripts/controllib.pl:420
+#: scripts/controllib.pl:422
 #, perl-format
 msgid "unable to open substvars file %s: %s"
 msgstr "impossible d'ouvrir le fichier substvars %s : %s"
 
-#: scripts/controllib.pl:472
+#: scripts/controllib.pl:474
 #, perl-format
 msgid "can't parse dependency %s"
 msgstr "impossible d'analyser la dépendance %s"
 
-#: scripts/controllib.pl:499
+#: scripts/controllib.pl:501
 msgid "fork for parse changelog"
 msgstr "fork pour analyse du changelog"
 
-#: scripts/controllib.pl:502 scripts/dpkg-genchanges.pl:276
-#: scripts/dpkg-gencontrol.pl:209 scripts/dpkg-source.pl:303
+#: scripts/controllib.pl:504 scripts/dpkg-genchanges.pl:274
+#: scripts/dpkg-gencontrol.pl:207 scripts/dpkg-source.pl:303
 msgid "parsed version of changelog"
 msgstr "version analysée du changelog"
 
-#: scripts/controllib.pl:504
+#: scripts/controllib.pl:506
 msgid "parse changelog"
 msgstr "analyse du changelog"
 
-#: scripts/controllib.pl:545
+#: scripts/controllib.pl:547
 #, perl-format
 msgid "source package name `%s' contains illegal character `%s'"
 msgstr ""
 "le nom du paquet source « %s » contient un caractère « %s » non autorisé"
 
-#: scripts/controllib.pl:547
+#: scripts/controllib.pl:549
 #, perl-format
 msgid "source package name `%s' starts with non-alphanum"
 msgstr ""
 "le nom du paquet source « %s » ne commence ni par une lettre ni par un "
 "chiffre"
 
-#: scripts/controllib.pl:553
+#: scripts/controllib.pl:555
 #, perl-format
 msgid "version number contains illegal character `%s'"
 msgstr "le numéro de version contient un caractère « %s » non autorisé"
 
-#: scripts/controllib.pl:562
+#: scripts/controllib.pl:564
 #, perl-format
 msgid "source package has two conflicting values - %s and %s"
 msgstr "le paquet source a deux valeurs en conflit : %s et %s"
 
-#: scripts/controllib.pl:571
+#: scripts/controllib.pl:573
 #, perl-format
 msgid "md5sum gave bogus output `%s'"
 msgstr "résultat anormal de md5sum « %s »"
 
-#: scripts/controllib.pl:603
+#: scripts/controllib.pl:605
 msgid "continued value line not in field"
 msgstr "la ligne continuée n'est pas dans le champ"
 
-#: scripts/controllib.pl:606
+#: scripts/controllib.pl:608
 msgid "expected blank line before PGP signature"
 msgstr "ligne blanche attendue avant la signature PGP"
 
-#: scripts/controllib.pl:618
+#: scripts/controllib.pl:620
 msgid "expected PGP signature, found EOF after blank line"
 msgstr "signature PGP attendue, EOF après ligne blanche trouvé"
 
-#: scripts/controllib.pl:621
+#: scripts/controllib.pl:623
 #, perl-format
 msgid "expected PGP signature, found something else `%s'"
 msgstr "signature PGP attendue, « %s » trouvé"
 
-#: scripts/controllib.pl:626
+#: scripts/controllib.pl:628
 msgid "found several `paragraphs' where only one expected"
 msgstr "plusieurs « paragraphes » trouvés, un seul attendu"
 
-#: scripts/controllib.pl:630
+#: scripts/controllib.pl:632
 msgid "line with unknown format (not field-colon-value)"
 msgstr "ligne au format inconnu, format différent de « champ-virgule-valeur »"
 
-#: scripts/controllib.pl:633
+#: scripts/controllib.pl:635
 msgid "found start of PGP body but no signature"
 msgstr "début d'un format PGP trouvé, mais pas de signature"
 
-#: scripts/controllib.pl:635
+#: scripts/controllib.pl:637
 msgid "empty file"
 msgstr "fichier vide"
 
-#: scripts/controllib.pl:641
+#: scripts/controllib.pl:643
 #, fuzzy, perl-format
 msgid "unknown information field '%s' in input data in %s"
 msgstr "champ d'information inconnu « %s » dans les données d'entrée de %s"
 
-#: scripts/controllib.pl:646
+#: scripts/controllib.pl:648
 #, perl-format
 msgid "syntax error in %s at line %d: %s"
 msgstr "erreur de syntaxe dans %s à la ligne %d : %s"
 
-#: scripts/controllib.pl:649
+#: scripts/controllib.pl:651
 #, perl-format
 msgid "%s: failure: %s"
 msgstr "%s : échec : %s"
 
-#: scripts/controllib.pl:650
+#: scripts/controllib.pl:652
 #, perl-format
 msgid "%s: failure: %s: %s"
 msgstr "%s : échec : %s : %s"
 
-#: scripts/controllib.pl:651
+#: scripts/controllib.pl:653
 #, perl-format
 msgid "%s: error: %s"
 msgstr "%s : erreur : %s"
 
-#: scripts/controllib.pl:652
+#: scripts/controllib.pl:654
 #, perl-format
 msgid "%s: internal error: %s"
 msgstr "%s : erreur interne : %s"
 
-#: scripts/controllib.pl:657
+#: scripts/controllib.pl:659
 #, perl-format
 msgid "%s: warning: %s"
 msgstr "%s : avertissement : %s"
 
-#: scripts/controllib.pl:681
+#: scripts/controllib.pl:683
 #, perl-format
 msgid "%s: failure: %s gave error exit status %s"
 msgstr "%s : échec : %s a produit une erreur de sortie de type %s"
 
-#: scripts/controllib.pl:684
+#: scripts/controllib.pl:686
 #, perl-format
 msgid "%s: failure: %s died from signal %s"
 msgstr "%s : échec : %s tué par le signal %s"
 
-#: scripts/controllib.pl:687
+#: scripts/controllib.pl:689
 #, perl-format
 msgid "%s: failure: %s failed with unknown exit code %d"
 msgstr "%s : échec : %s a échoué avec une erreur de sortie de type inconnu %d"
@@ -431,7 +431,7 @@ msgstr "%s : d
 msgid "%s: Build conflicts: "
 msgstr "%s : conflits de construction du paquet : "
 
-#: scripts/dpkg-checkbuilddeps.pl:155 scripts/dpkg-gencontrol.pl:230
+#: scripts/dpkg-checkbuilddeps.pl:155 scripts/dpkg-gencontrol.pl:228
 #: scripts/dpkg-source.pl:247
 #, perl-format
 msgid "error occurred while parsing %s"
@@ -471,27 +471,27 @@ msgstr "Il est demand
 msgid "filename, section and priority may contain no whitespace"
 msgstr "fichier, section et priorité ne peuvent contenir d'espace"
 
-#: scripts/dpkg-distaddfile.pl:67 scripts/dpkg-gencontrol.pl:294
+#: scripts/dpkg-distaddfile.pl:67 scripts/dpkg-gencontrol.pl:292
 msgid "open new files list file"
 msgstr "ouverture du nouveau fichier des fichiers"
 
-#: scripts/dpkg-distaddfile.pl:69 scripts/dpkg-gencontrol.pl:297
+#: scripts/dpkg-distaddfile.pl:69 scripts/dpkg-gencontrol.pl:295
 msgid "chown new files list file"
 msgstr "modification du propriétaire du nouveau fichier des fichiers"
 
-#: scripts/dpkg-distaddfile.pl:74 scripts/dpkg-gencontrol.pl:306
+#: scripts/dpkg-distaddfile.pl:74 scripts/dpkg-gencontrol.pl:304
 msgid "copy old entry to new files list file"
 msgstr "copie de l'ancienne entrée dans le nouveau fichier des fichiers"
 
-#: scripts/dpkg-distaddfile.pl:77 scripts/dpkg-gencontrol.pl:310
+#: scripts/dpkg-distaddfile.pl:77 scripts/dpkg-gencontrol.pl:308
 msgid "read old files list file"
 msgstr "lecture du nouveau fichier des fichiers"
 
-#: scripts/dpkg-distaddfile.pl:80 scripts/dpkg-gencontrol.pl:318
+#: scripts/dpkg-distaddfile.pl:80 scripts/dpkg-gencontrol.pl:316
 msgid "write new entry to new files list file"
 msgstr "écriture de la nouvelle entrée dans le nouveau fichier des fichiers"
 
-#: scripts/dpkg-distaddfile.pl:81 scripts/dpkg-gencontrol.pl:319
+#: scripts/dpkg-distaddfile.pl:81 scripts/dpkg-gencontrol.pl:317
 msgid "close new files list file"
 msgstr "fermeture du nouveau fichier des fichiers"
 
@@ -610,141 +610,141 @@ msgstr "ligne %d mal form
 msgid "general section of control info file"
 msgstr "section générale dans le fichier info"
 
-#: scripts/dpkg-genchanges.pl:227
+#: scripts/dpkg-genchanges.pl:226
 #, perl-format
 msgid "package %s in control file but not in files list"
 msgstr ""
 "paquet %s dans le fichier de contrôle mais pas dans le fichier des fichiers"
 
-#: scripts/dpkg-genchanges.pl:263 scripts/dpkg-gencontrol.pl:194
+#: scripts/dpkg-genchanges.pl:261 scripts/dpkg-gencontrol.pl:192
 #: scripts/dpkg-source.pl:290
 msgid "package's section of control info file"
 msgstr "section du paquet dans le fichier info"
 
-#: scripts/dpkg-genchanges.pl:280 scripts/dpkg-gencontrol.pl:213
+#: scripts/dpkg-genchanges.pl:278 scripts/dpkg-gencontrol.pl:211
 #: scripts/dpkg-source.pl:307
 #, perl-format
 msgid "value from nowhere, with key >%s< and value >%s<"
 msgstr "valeur de nulle part, avec clé >%s< et valeur >%s<"
 
-#: scripts/dpkg-genchanges.pl:287
+#: scripts/dpkg-genchanges.pl:285
 msgid "read changesdescription"
 msgstr "lecture de changesdescription"
 
-#: scripts/dpkg-genchanges.pl:298
+#: scripts/dpkg-genchanges.pl:296
 #, perl-format
 msgid "package %s listed in files list but not in control info"
 msgstr ""
 "paquet %s listé dans le fichier des fichiers mais pas dans le fichier info"
 
-#: scripts/dpkg-genchanges.pl:308
+#: scripts/dpkg-genchanges.pl:306
 #, perl-format
 msgid "missing Section for binary package %s; using '-'"
 msgstr "la section du paquet binaire %s manque ; utilisation de « - »"
 
-#: scripts/dpkg-genchanges.pl:310
+#: scripts/dpkg-genchanges.pl:308
 #, perl-format
 msgid "package %s has section %s in control file but %s in files list"
 msgstr ""
 "le paquet %s a une section %s dans le fichier de contrôle mais une section %"
 "s dans le fichier des fichiers"
 
-#: scripts/dpkg-genchanges.pl:317
+#: scripts/dpkg-genchanges.pl:315
 #, fuzzy, perl-format
 msgid "missing Priority for binary package %s; using '-'"
 msgstr "la section du paquet binaire %s manque ; utilisation de « - »"
 
-#: scripts/dpkg-genchanges.pl:319
+#: scripts/dpkg-genchanges.pl:317
 #, perl-format
 msgid "package %s has priority %s in control file but %s in files list"
 msgstr ""
 "le paquet %s a une priorité %s dans le fichier de contrôle mais une priorité "
 "%s dans le fichier des fichiers"
 
-#: scripts/dpkg-genchanges.pl:333
+#: scripts/dpkg-genchanges.pl:331
 msgid "missing Section for source files"
 msgstr "il manque la section pour les fichiers source"
 
-#: scripts/dpkg-genchanges.pl:338
+#: scripts/dpkg-genchanges.pl:336
 msgid "missing Priority for source files"
 msgstr "il manque la priorité pour les fichiers source"
 
-#: scripts/dpkg-genchanges.pl:343 scripts/dpkg-source.pl:678
+#: scripts/dpkg-genchanges.pl:341 scripts/dpkg-source.pl:678
 #: scripts/dpkg-source.pl:708
 #, perl-format
 msgid "cannot open .dsc file %s: %s"
 msgstr "impossible d'ouvrir le fichier .dsc %s : %s"
 
-#: scripts/dpkg-genchanges.pl:346 scripts/dpkg-source.pl:709
+#: scripts/dpkg-genchanges.pl:344 scripts/dpkg-source.pl:709
 #, perl-format
 msgid "source control file %s"
 msgstr "fichier de contrôle des sources %s"
 
-#: scripts/dpkg-genchanges.pl:352 scripts/dpkg-source.pl:748
+#: scripts/dpkg-genchanges.pl:350 scripts/dpkg-source.pl:748
 #, perl-format
 msgid "Files field contains bad line `%s'"
 msgstr "le champ Files contient une ligne mal formée « %s »"
 
-#: scripts/dpkg-genchanges.pl:364
+#: scripts/dpkg-genchanges.pl:362
 msgid "not including original source code in upload"
 msgstr "pas d'inclusion du code source original dans l'envoi (« upload »)"
 
-#: scripts/dpkg-genchanges.pl:368
+#: scripts/dpkg-genchanges.pl:366
 #, fuzzy
 msgid "ignoring -sd option for native Debian package"
 msgstr "option -sd ignorée pour les paquets Debian pure souche"
 
-#: scripts/dpkg-genchanges.pl:370
+#: scripts/dpkg-genchanges.pl:368
 msgid "including full source code in upload"
 msgstr "inclusion du code source original dans l'envoi (« upload »)"
 
-#: scripts/dpkg-genchanges.pl:373
+#: scripts/dpkg-genchanges.pl:371
 msgid "binary-only upload - not including any source code"
 msgstr "envoi d'un binaire - aucune inclusion de code source"
 
-#: scripts/dpkg-genchanges.pl:377
+#: scripts/dpkg-genchanges.pl:375
 msgid "write original source message"
 msgstr "écriture du message source original"
 
-#: scripts/dpkg-genchanges.pl:402
+#: scripts/dpkg-genchanges.pl:400
 #, perl-format
 msgid "cannot open upload file %s for reading"
 msgstr "impossible de lire le fichier d'envoi %s"
 
-#: scripts/dpkg-genchanges.pl:403
+#: scripts/dpkg-genchanges.pl:401
 #, perl-format
 msgid "cannot fstat upload file %s"
 msgstr "impossible de lancer « fstat » sur le fichier d'envoi %s"
 
-#: scripts/dpkg-genchanges.pl:405
+#: scripts/dpkg-genchanges.pl:403
 #, perl-format
 msgid "upload file %s is empty"
 msgstr "le fichier d'envoi %s est vide"
 
-#: scripts/dpkg-genchanges.pl:407
+#: scripts/dpkg-genchanges.pl:405
 #, perl-format
 msgid "md5sum upload file %s"
 msgstr "exécution de md5sum sur le fichier d'envoi %s"
 
-#: scripts/dpkg-genchanges.pl:409
+#: scripts/dpkg-genchanges.pl:407
 #, perl-format
 msgid "md5sum upload file %s gave strange output `%s'"
 msgstr "résultat anormal de md5sum sur le fichier d'envoi %s : « %s »"
 
-#: scripts/dpkg-genchanges.pl:412
+#: scripts/dpkg-genchanges.pl:410
 #, perl-format
 msgid "md5sum of source file %s (%s) is different from md5sum in %s (%s)"
 msgstr ""
 "le résultat de md5sum sur le fichier source %s (%s) diffère du résultat sur %"
 "s (%s)"
 
-#: scripts/dpkg-genchanges.pl:427 scripts/dpkg-source.pl:317
+#: scripts/dpkg-genchanges.pl:425 scripts/dpkg-source.pl:317
 #, perl-format
 msgid "missing information for critical output field %s"
 msgstr "il manque l'information pour l'important champ de sortie %s"
 
-#: scripts/dpkg-genchanges.pl:431 scripts/dpkg-gencontrol.pl:251
-#: scripts/dpkg-gencontrol.pl:254 scripts/dpkg-source.pl:321
+#: scripts/dpkg-genchanges.pl:429 scripts/dpkg-gencontrol.pl:249
+#: scripts/dpkg-gencontrol.pl:252 scripts/dpkg-source.pl:321
 #, perl-format
 msgid "missing information for output field %s"
 msgstr "il manque l'information pour le champ de sortie %s"
@@ -824,55 +824,55 @@ msgid "must specify package since control info has many (%s)"
 msgstr ""
 "il faut indiquer un paquet car le fichier de contrôle contient plusieurs (%s)"
 
-#: scripts/dpkg-gencontrol.pl:180
+#: scripts/dpkg-gencontrol.pl:178
 #, perl-format
 msgid "`%s' is not a legal architecture string."
 msgid_plural "`%s' are not legal architecture strings."
 msgstr[0] "« %s » n'est pas une architecture autorisée."
 msgstr[1] "« %s » ne sont pas des architectures autorisées."
 
-#: scripts/dpkg-gencontrol.pl:186
+#: scripts/dpkg-gencontrol.pl:184
 #, perl-format
 msgid "current build architecture %s does not appear in package's list (%s)"
 msgstr "l'actuelle architecture de construction %s n'apparaît pas dans %s"
 
-#: scripts/dpkg-gencontrol.pl:266
+#: scripts/dpkg-gencontrol.pl:264
 msgid "fork for du"
 msgstr "fork pour du"
 
-#: scripts/dpkg-gencontrol.pl:268
+#: scripts/dpkg-gencontrol.pl:266
 #, perl-format
 msgid "chdir for du to `%s'"
 msgstr "chdir pour du vers %s"
 
-#: scripts/dpkg-gencontrol.pl:269
+#: scripts/dpkg-gencontrol.pl:267
 msgid "exec du"
 msgstr "exec du"
 
-#: scripts/dpkg-gencontrol.pl:275
+#: scripts/dpkg-gencontrol.pl:273
 #, perl-format
 msgid "du in `%s'"
 msgstr "du dans %s"
 
-#: scripts/dpkg-gencontrol.pl:276
+#: scripts/dpkg-gencontrol.pl:274
 #, perl-format
 msgid "du gave unexpected output `%s'"
 msgstr "résultat inattendu de du %s"
 
-#: scripts/dpkg-gencontrol.pl:308
+#: scripts/dpkg-gencontrol.pl:306
 msgid "close old files list file"
 msgstr "fermeture de l'ancien fichier des fichiers"
 
-#: scripts/dpkg-gencontrol.pl:320
+#: scripts/dpkg-gencontrol.pl:318
 msgid "install new files list file"
 msgstr "installation du nouveau fichier des fichiers"
 
-#: scripts/dpkg-gencontrol.pl:327
+#: scripts/dpkg-gencontrol.pl:325
 #, perl-format
 msgid "cannot open new output control file `%s'"
 msgstr "impossible d'ouvrir nouveau fichier de sortie %s"
 
-#: scripts/dpkg-gencontrol.pl:335
+#: scripts/dpkg-gencontrol.pl:333
 #, perl-format
 msgid "cannot install output control file `%s'"
 msgstr "impossible d'installer nouveau fichier de sortie %s"