From: Guillem Jover <guillem@debian.org>
Date: Sat, 29 Dec 2007 05:37:51 +0000 (+0100)
Subject: Regenerate .pot files and merge .po files with them
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7fbf08ac94945e2c4a9de92b1dfd4d885d0a3af;p=dpkg

Regenerate .pot files and merge .po files with them
---

diff --git a/dselect/po/ChangeLog b/dselect/po/ChangeLog
index dcc53234..4300db06 100644
--- a/dselect/po/ChangeLog
+++ b/dselect/po/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-29  Guillem Jover  <guillem@debian.org>
+
+	* dselect.pot: Regenerated.
+	* *.po: Merged with dselect.pot.
+
 2007-12-29  Guillem Jover  <guillem@debian.org>
 
 	* he.po: Remove obsolete translation.
diff --git a/dselect/po/ca.po b/dselect/po/ca.po
index c35687ef..9eb7e90c 100644
--- a/dselect/po/ca.po
+++ b/dselect/po/ca.po
@@ -416,8 +416,7 @@ msgstr ""
 "qualsevol moment per a obtindre ajuda.\n"
 "\n"
 "Quan hagueu acabat de seleccionar paquets, prémeu <enter> per a confirmar\n"
-"els canvis, o «X» per a sortir sense desar els canvis. Llavors es "
-"realitzarà\n"
+"els canvis, o «X» per a sortir sense desar els canvis. Llavors es realitzarà\n"
 "una darrera verificació dels conflictes i dependències - aquí també podrieu\n"
 "veure una subllista.\n"
 "\n"
@@ -509,8 +508,7 @@ msgstr ""
 "combinacions de paquets no es poden instal·lar juntes.\n"
 "\n"
 "Veureu una subllista que conté els paquets involucrats. La meitat inferior\n"
-"de la pantalla mostra les dependències i conflictes rellevants; useu «i» "
-"per\n"
+"de la pantalla mostra les dependències i conflictes rellevants; useu «i» per\n"
 "a canviar entre això, les descripcions dels paquets i la informació interna\n"
 "de control.\n"
 "\n"
@@ -580,8 +578,7 @@ msgstr ""
 "                          «*»  - instal·lat;\n"
 "                          «-»  - no instal·lat, però queden fitxers de "
 "config.;\n"
-"         els paquets en { «U»  - desempaquetat però encara sense "
-"configurar;\n"
+"         els paquets en { «U»  - desempaquetat però encara sense configurar;\n"
 "         aquests estats { «C»  - semi-configurat (s'ha produït un error);\n"
 "         estan trencats { «I»  - semi-instal·lat (s'ha produïtun error).\n"
 " Marca antiga: el requerit per aquest paquet abans de presentar aquesta "
@@ -636,8 +633,7 @@ msgstr ""
 "  de l'estat del paquet ressaltat o una descripció del grup ressaltat si es\n"
 "  tracta d'una línia de grup.  Si no enteneu el significat d'alguns dels\n"
 "  caràcters d'estat mostrats, dirigiu-vos al paquet rellevant i mireu en\n"
-"  aquesta línia de divisió, o useu la tecla «v» per a una pantalla "
-"detallada\n"
+"  aquesta línia de divisió, o useu la tecla «v» per a una pantalla detallada\n"
 "  (premeu «v» novament per a tornar a la vista anterior).\n"
 "\n"
 "* El final de la pantalla mostra més informació sobre el paquet actualment\n"
@@ -1260,8 +1256,7 @@ msgstr ""
 #: dselect/methparse.cc:216
 #, c-format
 msgid "error during read of method options file `%.250s'"
-msgstr ""
-"s'ha produït un error en llegir el fitxer d'opcions del mètode «%.250s»"
+msgstr "s'ha produït un error en llegir el fitxer d'opcions del mètode «%.250s»"
 
 #: dselect/methparse.cc:246
 #, c-format
diff --git a/dselect/po/de.po b/dselect/po/de.po
index eaeb9b42..522130c1 100644
--- a/dselect/po/de.po
+++ b/dselect/po/de.po
@@ -593,8 +593,7 @@ msgstr ""
 "Im knappen Modus (ausführlich mit »v«) sind es folgende einzelne Zeichen:\n"
 "\n"
 " Fehler: Leer - kein Fehler (aber Paket evtl. in inkonsist. Zustand - s.u.)\n"
-"         »R«  - schwerer Fehler bei der Installation, Neuinstallation "
-"nötig;\n"
+"         »R«  - schwerer Fehler bei der Installation, Neuinstallation nötig;\n"
 " Installationsstatus:  Leer  - nicht installiert;\n"
 "                       »*«  - installiert;\n"
 "                       »-«  - nicht installiert, aber Konfiguration "
@@ -1642,8 +1641,8 @@ msgstr ""
 "\n"
 "Wenn Sie die Hervorhebung auf eine Zeile für ein bestimmtes Paket bewegen, "
 "sehen Sie hier Informationen zu diesem Paket.\n"
-"Sie können »o« und »O« benutzen, um die Sortierreihenfolge zu ändern und "
-"damit die Pakete in anderen Gruppen zu markieren."
+"Sie können »o« und »O« benutzen, um die Sortierreihenfolge zu ändern und damit "
+"die Pakete in anderen Gruppen zu markieren."
 
 #: dselect/pkginfo.cc:95
 msgid "Interrelationships"
diff --git a/dselect/po/et.po b/dselect/po/et.po
index 5eaff7e6..3c44fce1 100644
--- a/dselect/po/et.po
+++ b/dselect/po/et.po
@@ -1,6 +1,6 @@
 # dselect eesti keele tõlge.
 # Estonian translation of dselect.
-# 
+#
 # This file is distributed under the same license as the dselect package.
 #
 # Copyright (C) 2007 Free Software Foundation, Inc.
diff --git a/dselect/po/fr.po b/dselect/po/fr.po
index 7a9c565f..78ebe60d 100644
--- a/dselect/po/fr.po
+++ b/dselect/po/fr.po
@@ -580,8 +580,7 @@ msgstr ""
 "dernières,\n"
 "la description des paquets et les informations internes de contrôle.\n"
 "\n"
-"Un ensemble de paquets « suggérés » a été calculé, et les marquages "
-"initiaux\n"
+"Un ensemble de paquets « suggérés » a été calculé, et les marquages initiaux\n"
 "de cette sous-liste ont été positionnés pour correspondre à ces derniers,\n"
 "donc il ne vous reste plus qu'à appuyer sur Entrée pour accepter ces\n"
 "suggestions selon votre bon vouloir. Vous pouvez annuler la(les)\n"
@@ -643,8 +642,7 @@ msgstr ""
 " Drapeau d'erreur :     Espace   - aucune erreur (mais le paquet peut être\n"
 "                                   dans un état endommagé - voir ci-"
 "dessous)\n"
-"                        « R »    - sérieux problèmes lors de "
-"l'installation,\n"
+"                        « R »    - sérieux problèmes lors de l'installation,\n"
 "                                   nécessite une réinstallation ;\n"
 " État d'installation :  Espace   - non installé ;\n"
 "                        « * »    - installé ;\n"
@@ -710,8 +708,7 @@ msgstr ""
 "  succincte sur l'état du paquet présentement surligné, ou une description\n"
 "  de l'éventuel groupe surligné. Si vous ne comprenez pas le sens de\n"
 "  certains caractères d'état affichés, déplacez-vous sur le paquet adéquat\n"
-"  et regardez la ligne de division, ou utilisez la touche « v » pour "
-"obtenir\n"
+"  et regardez la ligne de division, ou utilisez la touche « v » pour obtenir\n"
 "  un affichage verbeux (appuyez encore sur « v » pour revenir à l'affichage\n"
 "  laconique).\n"
 "\n"
@@ -943,8 +940,7 @@ msgstr ""
 "Ce programme est un logiciel libre ; prière de consulter la « GNU General\n"
 "Public  License » version 2 ou supérieure pour prendre connaissance des\n"
 "conditions de reproduction. AUCUNE garantie n'est offerte.\n"
-"Voir « %s --license » pour les détails de licence et droits de "
-"reproduction.\n"
+"Voir « %s --license » pour les détails de licence et droits de reproduction.\n"
 
 #: dselect/main.cc:168
 #, c-format
@@ -1253,8 +1249,7 @@ msgstr "erreur de lecture sur le fichier des options 
 #: dselect/methparse.cc:86
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
-msgstr ""
-"impossible de lire le répertoire « %.250s » pour récupérer les méthodes"
+msgstr "impossible de lire le répertoire « %.250s » pour récupérer les méthodes"
 
 #: dselect/methparse.cc:100
 #, c-format
@@ -1694,9 +1689,8 @@ msgstr ""
 "\n"
 "Si vous déplacez le surlignage sur la ligne d'un paquet particulier, vous "
 "verrez s'afficher ici les informations qui concernent ce paquet.\n"
-"Vous pouvez utiliser « o » et « O » pour changer le critère de tri ce qui "
-"vous permet de marquer des paquets appartenant à des groupes de types "
-"différents."
+"Vous pouvez utiliser « o » et « O » pour changer le critère de tri ce qui vous "
+"permet de marquer des paquets appartenant à des groupes de types différents."
 
 #: dselect/pkginfo.cc:95
 msgid "Interrelationships"
diff --git a/dselect/po/nb.po b/dselect/po/nb.po
index 16266ff7..1c0461ff 100644
--- a/dselect/po/nb.po
+++ b/dselect/po/nb.po
@@ -461,8 +461,7 @@ msgstr ""
 "Du bør lese oversikten over taster og forklaringene til skjermbildet. Det \n"
 "finnes en god del skjermhjelp som du kan vise ved å trykke på «?».\n"
 "\n"
-"Når du er ferdig med å studere lista, kan du avslutta med «Q» eller "
-"<enter>.\n"
+"Når du er ferdig med å studere lista, kan du avslutta med «Q» eller <enter>.\n"
 "\n"
 "Trykk <mellomrom> for å avslutte hjelp og gå til lista nå.\n"
 
@@ -512,8 +511,7 @@ msgstr ""
 "noen kombinasjoner av pakker går ikke sammen.\n"
 "\n"
 "Du vil få se en egen liste med bare de pakkene dette gjelder. Nederst på \n"
-"skjermen er konflikter og pakkekrav vist. Med «i» kan du bytte mellom "
-"dette \n"
+"skjermen er konflikter og pakkekrav vist. Med «i» kan du bytte mellom dette \n"
 "feltet og feltene for pakkebeskrivelser og intern kontrollinformasjon.\n"
 "\n"
 "Et sett med «foreslåtte» pakker er gjort klart, og pakkene i lista er \n"
@@ -524,8 +522,7 @@ msgstr ""
 "Du kan også bla gjennom lista og endre på markeringene slik du vil ha dem, "
 "og \n"
 "du kan forkaste forslaget ved å trykke stor «D» eller «R». (Se \n"
-"hjelpeskjermen for tastetrykk.) Med stor «Q» kan du tvinge gjennom et "
-"valg, \n"
+"hjelpeskjermen for tastetrykk.) Med stor «Q» kan du tvinge gjennom et valg, \n"
 "dersom du vil overstyre rådene eller tror at programmet tar feil.\n"
 "\n"
 "Trykk <mellomrom> for å avslutte hjelp og gå til lista. Husk at du kan få "
@@ -569,8 +566,7 @@ msgid ""
 msgstr ""
 "Den øverste halvdelen av skjermen viser ei liste over pakkene. For hver "
 "pakke \n"
-"finnes det fire kolonner for status i systemet. I kortmodus (bruk «v» for "
-"Ã¥ \n"
+"finnes det fire kolonner for status i systemet. I kortmodus (bruk «v» for å \n"
 "bytte til detaljmodus) er kolonnene enkelttegn fra venstre til høyre:\n"
 "\n"
 " Feilmerke: Mellomrom - ingen feil (men pakken kan være ødelagt, se "
@@ -590,8 +586,7 @@ msgstr ""
 "   «-»: markert for fjerning, men oppsettsfilene vil ligge igjen\n"
 "   «=»: på vent, pakken skal ikke endres i det hele tatt\n"
 "   «_»: markert for fullstendig fjerning, inkludert oppsettet\n"
-"   «n»: pakken er ny og er ennå ikke markert for installering, fjerning e."
-"l.\n"
+"   «n»: pakken er ny og er ennå ikke markert for installering, fjerning e.l.\n"
 "\n"
 "For hver pakke kan du også se informasjon om prioritet, kategori, navn, \n"
 "installerte og tilgjengelige versjoner (vis/skjul med Shift + V) og \n"
diff --git a/dselect/po/nn.po b/dselect/po/nn.po
index b6e02eab..1563cf33 100644
--- a/dselect/po/nn.po
+++ b/dselect/po/nn.po
@@ -35,8 +35,8 @@ msgstr "Hjelp: "
 #: dselect/basecmds.cc:177
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
-"Trykk ? for å visa hjelpemeny, «.» for neste emne, <mellomrom> for å "
-"avslutta hjelpa."
+"Trykk ? for å visa hjelpemeny, «.» for neste emne, <mellomrom> for å avslutta "
+"hjelpa."
 
 #: dselect/basecmds.cc:184
 msgid "Help information is available under the following topics:"
@@ -523,8 +523,7 @@ msgstr ""
 "Du kan òg bla gjennom lista og endra på markeringane slik du vil ha dei, "
 "og \n"
 "du kan forkasta framlegget ved å trykkja stor «D» eller «R». (Sjå \n"
-"hjelpeskjermen for tastetrykk.) Med stor «Q» kan du tvinga gjennom eit "
-"val, \n"
+"hjelpeskjermen for tastetrykk.) Med stor «Q» kan du tvinga gjennom eit val, \n"
 "dersom du vil overstyra råda eller trur at programmet tek feil.\n"
 "\n"
 "Trykk <mellomrom> for å avslutta hjelpa og gå til lista. \n"
@@ -567,8 +566,7 @@ msgid ""
 msgstr ""
 "Den øvste halvdelen av skjermen viser ei liste over pakkane. For kvar "
 "pakke \n"
-"finst det fire kolonnar for status i systemet. I stuttmodus (bruk «v» for "
-"Ã¥ \n"
+"finst det fire kolonnar for status i systemet. I stuttmodus (bruk «v» for å \n"
 "byta til detaljmodus) er kolonnane enkeltteikn frå venstre til høgre:\n"
 "\n"
 " Feilmerke: Mellomrom - ingen feil (men pakken kan vera øydelagd, sjå "
diff --git a/dselect/po/tl.po b/dselect/po/tl.po
index 570fe8a2..cd0491a4 100644
--- a/dselect/po/tl.po
+++ b/dselect/po/tl.po
@@ -2,8 +2,8 @@
 # Copyright (C) 2005 Eric Pareja
 # This file is distributed under the same license as the package dpkg.
 # Eric Pareja, 2005
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
diff --git a/dselect/po/vi.po b/dselect/po/vi.po
index 3e88c1a7..8bcb93a8 100644
--- a/dselect/po/vi.po
+++ b/dselect/po/vi.po
@@ -528,8 +528,7 @@ msgstr ""
 "\n"
 "Đồng thời còn có thể di chuyển xung quanh danh sách\n"
 "và thay đổi các dấu cho hợp với ý muốn,\n"
-"và có thể « bỏ đi » các đề nghị của trình này bằng « D » hoặc « R » viết "
-"hoa\n"
+"và có thể « bỏ đi » các đề nghị của trình này bằng « D » hoặc « R » viết hoa\n"
 "(xem màn hình trợ giúp phím).\n"
 "Có thể dùng « Q » viết hoa để bắt buộc chương trình chấp nhận\n"
 "tình huống đã hiển thị, trong trường hợp muốn bỏ qua những lời khuyên\n"
diff --git a/dselect/po/zh_TW.po b/dselect/po/zh_TW.po
index b5d245f8..18e9c774 100644
--- a/dselect/po/zh_TW.po
+++ b/dselect/po/zh_TW.po
@@ -1,8 +1,8 @@
 # Traditional Chinese translation to dpkg.
 # Copyright (C) 2004 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
diff --git a/man/ChangeLog b/man/ChangeLog
index 3f61386e..6870a65a 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-29  Guillem Jover  <guillem@debian.org>
+
+	* po/sv.po: Merged with dpkg-man.pot.
+
 2007-12-27  Peter Karlsson  <peterk@debian.org>
 
 	* po/sv.po: Updated to 1384t.
diff --git a/man/po/sv.po b/man/po/sv.po
index 3974a463..6e4aef0e 100644
--- a/man/po/sv.po
+++ b/man/po/sv.po
@@ -11,7 +11,7 @@ msgstr ""
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
 # type: Plain text
 #: ../../man/822-date.1:2
@@ -7361,7 +7361,8 @@ msgid ""
 "minimal version required by the corresponding package in the Build-Depends "
 "field and use this version if it's higher than the minimal version computed "
 "by scanning symbols."
-msgstr "Som en säkerhetsåtgärd kan en symbols-fil innehålla metainformationsfältet "
+msgstr ""
+"Som en säkerhetsåtgärd kan en symbols-fil innehålla metainformationsfältet "
 "I<Build-Depends-Package>, varpå B<dpkg-shlibdeps> hämtar vilken minsta "
 "version som behövs för paketet ur Builds-Depends-fältet och använder denna "
 "version om den är högre än den minsta version som beräknats genom att söka "
diff --git a/po/ChangeLog b/po/ChangeLog
index e5fe8916..b69cac88 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-29  Guillem Jover  <guillem@debian.org>
+
+	* dpkg.pot: Regenerated.
+	* *.po: Merged with dpkg.pot.
+
 2007-12-29  Guillem Jover  <guillem@debian.org>
 
 	* he.po: Remove obsolete translation.
diff --git a/po/bs.po b/po/bs.po
index db5ff937..891426c2 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-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\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"
@@ -4028,7 +4028,7 @@ msgid "unable to close %s after read: %s"
 msgstr ""
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr ""
@@ -4091,7 +4091,7 @@ msgid ""
 msgstr ""
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr ""
@@ -4115,13 +4115,13 @@ msgid "package may not contain newlines"
 msgstr ""
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr ""
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, perl-format
 msgid "unknown option `%s'"
 msgstr ""
@@ -4214,59 +4214,59 @@ msgstr ""
 msgid "cannot stat new name `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
 "  different file `%s', not allowed"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, perl-format
 msgid "install new diversions: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr ""
@@ -4710,223 +4710,193 @@ msgstr ""
 msgid "Current `best' version is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
 #, perl-format
-msgid "unknown argument `%s'"
+msgid ""
+"warning: %s is supposed to be a symlink to %s, \n"
+"or nonexistent; however, readlink failed: %s"
+msgstr ""
+
+#: scripts/update-alternatives.pl:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr ""
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
 msgstr ""
 
 #: scripts/update-alternatives.pl:256
+#, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr ""
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr ""
+
+#: scripts/update-alternatives.pl:288
+#, perl-format
+msgid "unable to remove %s: %s"
+msgstr ""
+
+#: scripts/update-alternatives.pl:301
+#, perl-format
+msgid "unknown argument `%s'"
+msgstr ""
+
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr ""
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, perl-format
 msgid "--%s needs <name>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:293
+#: scripts/update-alternatives.pl:351
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
 msgstr ""
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr ""
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, perl-format
-msgid "unable to remove %s: %s"
-msgstr ""
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
 "Switching to manual updates only."
 msgstr ""
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, 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:392
+#: scripts/update-alternatives.pl:448
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:489
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 
-#: scripts/update-alternatives.pl:447
+#: scripts/update-alternatives.pl:503
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: scripts/update-alternatives.pl:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr ""
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr ""
 
-#: scripts/update-alternatives.pl:497
+#: scripts/update-alternatives.pl:551
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:501
+#: scripts/update-alternatives.pl:555
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr ""
 
-#: scripts/update-alternatives.pl:516
+#: scripts/update-alternatives.pl:569
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:539
+#: scripts/update-alternatives.pl:592
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr ""
 
-#: scripts/update-alternatives.pl:553
-#, 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:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr ""
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, perl-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr ""
-
-#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, perl-format
-msgid "unable to install %s as %s: %s"
-msgstr ""
-
-#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr ""
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr ""
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr ""
-
-#: scripts/update-alternatives.pl:600
-#, 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:634
+#: scripts/update-alternatives.pl:631
 #, perl-format
 msgid ""
 "There is no program which provides %s.\n"
 "Nothing to configure.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
 "(%s). Nothing to configure.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -4935,41 +4905,46 @@ msgid ""
 "-----------------------------------------------\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 
-#: scripts/update-alternatives.pl:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr ""
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:696
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:736
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "missing newline after %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, perl-format
+msgid "unable to make %s a symlink to %s: %s"
+msgstr ""
+
+#: scripts/update-alternatives.pl:715
+#, perl-format
+msgid "unable to install %s as %s: %s"
+msgstr ""
+
+#: scripts/update-alternatives.pl:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index d01fda29..2490b757 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-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\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"
@@ -420,8 +420,8 @@ msgstr "s'ha indicat com conffile el directori arrel o un directori nul"
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
 msgstr ""
-"En el camp «%s», falta un nom de paquet, o s'ha trobat brutícia on "
-"s'esperava un nom de paquet"
+"En el camp «%s», falta un nom de paquet, o s'ha trobat brutícia on s'esperava "
+"un nom de paquet"
 
 #: lib/fields.c:341
 #, c-format
@@ -487,8 +487,7 @@ msgstr "camp «%s», referència a «%.255s»: error en la versió: %.255s"
 #: lib/fields.c:439
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
-msgstr ""
-"camp «%s», error de sintaxi després de la referència al paquet «%.255s»"
+msgstr "camp «%s», error de sintaxi després de la referència al paquet «%.255s»"
 
 #: lib/fields.c:447
 #, c-format
@@ -845,8 +844,8 @@ msgstr "ha de començar amb un caràcter alfanumèric"
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr ""
-"el caràcter «%c» no està permès (només s'admeten lletres, dígits i caràcters "
-"«%s»"
+"el caràcter «%c» no està permès (només s'admeten lletres, dígits i caràcters «%"
+"s»"
 
 #: lib/parsehelp.c:184
 msgid "<none>"
@@ -951,8 +950,7 @@ msgstr ""
 #: src/archives.c:440
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
-msgstr ""
-"no es pot fer «stat» sobre «%.255s» (que és el que s'anava a instal·lar)"
+msgstr "no es pot fer «stat» sobre «%.255s» (que és el que s'anava a instal·lar)"
 
 #: src/archives.c:448
 #, c-format
@@ -966,8 +964,8 @@ msgstr ""
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
 msgstr ""
-"no es pot fer «stat» sobre el «%.255s» restablert abans d'instal·lar una "
-"altra versió"
+"no es pot fer «stat» sobre el «%.255s» restablert abans d'instal·lar una altra "
+"versió"
 
 #: src/archives.c:489
 #, c-format
@@ -989,8 +987,8 @@ msgstr "Reemplaçat pels fitxers al paquet instal·lat %s ...\n"
 msgid ""
 "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
 msgstr ""
-"s'està intentant sobreescriure el directori «%.250s» del paquet %.250s amb "
-"un no directori"
+"s'està intentant sobreescriure el directori «%.250s» del paquet %.250s amb un "
+"no directori"
 
 #: src/archives.c:568
 #, c-format
@@ -1390,8 +1388,7 @@ msgstr ""
 #, c-format
 msgid "dpkg: %s: warning - failed to rename `%.250s' to `%.250s': %s\n"
 msgstr ""
-"dpkg: %s: avís - s'ha produït un error en reanomenar «%.250s» a «%.250s»: %"
-"s\n"
+"dpkg: %s: avís - s'ha produït un error en reanomenar «%.250s» a «%.250s»: %s\n"
 
 #: src/configure.c:249
 #, c-format
@@ -2472,8 +2469,8 @@ msgstr ""
 #, c-format
 msgid "Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr ""
-"Utilitzeu «dselect» o «aptitude» si voleu un programa de gestió de paquets "
-"més amigable.\n"
+"Utilitzeu «dselect» o «aptitude» si voleu un programa de gestió de paquets més "
+"amigable.\n"
 
 #: src/main.c:141
 msgid ""
@@ -2558,8 +2555,7 @@ msgstr "--debug requereix d'un número octal com a paràmetre"
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
-"nom de paquet buit en la llista de --ignore-depends separats per coma "
-"«%.250s»"
+"nom de paquet buit en la llista de --ignore-depends separats per coma «%.250s»"
 
 #: src/main.c:272
 #, c-format
@@ -3340,8 +3336,7 @@ msgstr "S'estan purgant els fitxers de configuració de %s ...\n"
 #: src/remove.c:455
 #, c-format
 msgid "cannot remove old config file `%.250s' (= `%.250s')"
-msgstr ""
-"no es pot eliminar el fitxer de configuració antic «%.250s» (= «%.250s»)"
+msgstr "no es pot eliminar el fitxer de configuració antic «%.250s» (= «%.250s»)"
 
 #: src/remove.c:470
 #, c-format
@@ -3560,8 +3555,8 @@ msgstr "cadena buida de fgets al llegir conffiles"
 msgid ""
 "warning, conffile name `%.50s...' is too long, or missing final newline\n"
 msgstr ""
-"avís, el nom de conffile «%.50s...» és massa llarg, o li falta el caràcter "
-"de nova línia final\n"
+"avís, el nom de conffile «%.50s...» és massa llarg, o li falta el caràcter de "
+"nova línia final\n"
 
 #: dpkg-deb/build.c:316
 #, c-format
@@ -3635,8 +3630,7 @@ msgstr "control"
 
 #: dpkg-deb/build.c:374
 msgid "failed to fstat tmpfile (control)"
-msgstr ""
-"s'ha produït un error en fer «fstat» sobre el fitxer temporal (control)"
+msgstr "s'ha produït un error en fer «fstat» sobre el fitxer temporal (control)"
 
 #: dpkg-deb/build.c:397
 msgid "failed to rewind tmpfile (control)"
@@ -4129,8 +4123,7 @@ msgstr "no es pot fer «seek» cap enradera"
 #: dpkg-split/info.c:105
 #, c-format
 msgid "file `%.250s' is corrupt - bad padding character (code %d)"
-msgstr ""
-"el fitxer «%.250s» està corromput - caràcter de farcit erroni (codi %d)"
+msgstr "el fitxer «%.250s» està corromput - caràcter de farcit erroni (codi %d)"
 
 #: dpkg-split/info.c:109
 #, c-format
@@ -4141,8 +4134,8 @@ msgstr "el fitxer «%.250s» està corromput - hi ha nuls en la secció d'info."
 #, c-format
 msgid "file `%.250s' is format version `%.250s' - you need a newer dpkg-split"
 msgstr ""
-"el fitxer «%.250s» té un format versió «%.250s» - necessiteu un dpkg-split "
-"més nou"
+"el fitxer «%.250s» té un format versió «%.250s» - necessiteu un dpkg-split més "
+"nou"
 
 #: dpkg-split/info.c:124
 #, c-format
@@ -4172,15 +4165,14 @@ msgstr ""
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr ""
-"el fitxer «%.250s» està corromput - el segon element no és un element de "
-"dades"
+"el fitxer «%.250s» està corromput - el segon element no és un element de dades"
 
 #: dpkg-split/info.c:153
 #, c-format
 msgid "file `%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr ""
-"el fitxer «%.250s» està corromput - número equivocat de parts per a les "
-"mides indicades"
+"el fitxer «%.250s» està corromput - número equivocat de parts per a les mides "
+"indicades"
 
 #: dpkg-split/info.c:157
 #, c-format
@@ -4592,7 +4584,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:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "no es pot tancar %s: %s"
@@ -4685,7 +4677,7 @@ msgstr ""
 "divert.\n"
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, fuzzy, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr "s'ha especificat dos modes: %s i --%s"
@@ -4709,13 +4701,13 @@ msgid "package may not contain newlines"
 msgstr "el paquet no pot contenir salts de línia"
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s necessita un <directori> com a paràmetre"
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "l'opció «%s» és desconeguda"
@@ -4816,12 +4808,12 @@ msgstr "no es pot fer «stat» sobre el nom vell «%s»: %s"
 msgid "cannot stat new name `%s': %s"
 msgstr "no es pot fer «stat» sobre el nom nou «%s»: %s"
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "s'ha produït un error en comprovar «%s»: %s"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4830,47 +4822,47 @@ msgstr ""
 "el canvi de nom implica sobreescriure «%s» amb\n"
 "  el fitxer diferent «%s», no és permés"
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "canvi de nom: suprimeix l'enllaç vell duplicat «%s»: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "canvi de nom: canvia el nom de «%s» a «%s»: %s"
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "crea el diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "escriu el diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "tanca el diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "esborra l'antic diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "crea el nou diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "instal·la el nou diversions: %s"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "s'ha produït un error intern: %s està corromput: %s"
@@ -5417,54 +5409,88 @@ msgstr "No hi ha cap versió disponible."
 msgid "Current `best' version is %s."
 msgstr "Actualment la «millor» versió és %s."
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
+#, fuzzy, perl-format
+msgid ""
+"warning: %s is supposed to be a symlink to %s, \n"
+"or nonexistent; however, readlink failed: %s"
+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:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr "S'està deixant %s (%s) apuntant cap a %s."
+
+#: scripts/update-alternatives.pl:247
+#, 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:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr "S'utilitzarà «%s» per proveir «%s»."
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, 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:288
+#, perl-format
+msgid "unable to remove %s: %s"
+msgstr "no es pot esborrar %s: %s"
+
+#: scripts/update-alternatives.pl:301
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "l'argument «%s» és desconegut"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install necessita <enllaç> <nom> <camí> <prioritat>"
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr "la prioritat ha de ser un enter"
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s necessita <nom> <camí>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s necessita <nom>"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave necessita <enllaç> <nom> <camí>"
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "el nom de l'esclau %s està duplicat"
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "l'enllaç duplicat %s està duplicat"
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "el nom %s és alhora primari i esclau"
 
-#: scripts/update-alternatives.pl:293
+#: scripts/update-alternatives.pl:351
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "l'enllaç %s és alhora primari i esclau"
 
-#: scripts/update-alternatives.pl:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5472,31 +5498,21 @@ msgstr ""
 "es necessita --display, --config, --set, --install, --remove, --all, --"
 "remove-all o --auto"
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr "--slave només es pot especificar junt amb --install"
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "No hi ha alternatives per a %s."
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "S'està configurant la selecció automàtica de %s."
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, perl-format
-msgid "unable to remove %s: %s"
-msgstr "no es pot esborrar %s: %s"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5505,7 +5521,7 @@ msgstr ""
 "%s ha estat modificat (manualment o per alguna seqüència).\n"
 "S'està canviant a modificacions manuals únicament."
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5515,7 +5531,7 @@ msgstr ""
 "a %s ...\n"
 "(Si ho voleu, podeu modificar els enllaços simbòlics - vegeu «man ln».)"
 
-#: scripts/update-alternatives.pl:392
+#: scripts/update-alternatives.pl:448
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "S'està tornant a anomenar l'enllaç %s de %s a %s.n"
@@ -5523,122 +5539,66 @@ 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:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "no es pot reanomenar %s a %s: %s"
 
-#: scripts/update-alternatives.pl:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "nom d'enllaç esclau %s duplicat"
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, 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:433
+#: scripts/update-alternatives.pl:489
 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:447
+#: scripts/update-alternatives.pl:503
 #, 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:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "S'està descartant l'enllaç esclau obsolet %s (%s)."
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, 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:497
+#: scripts/update-alternatives.pl:551
 #, 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:501
+#: scripts/update-alternatives.pl:555
 #, 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:516
+#: scripts/update-alternatives.pl:569
 #, 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:539
+#: scripts/update-alternatives.pl:592
 #, 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:553
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a symlink to %s\n"
-" (or nonexistent); however, readlink failed: %s"
-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:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr "no es pot garantir que %s sigui no existent: %s"
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, 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:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, 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:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr "S'està deixant %s (%s) apuntant cap a %s."
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, 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:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, 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:600
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a slave symlink to\n"
-" %s, or nonexistent; however, readlink failed: %s"
-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:634
+#: scripts/update-alternatives.pl:631
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5647,7 +5607,7 @@ msgstr ""
 "Només hi ha 1 programa que proveeixi %s\n"
 "(%s). No hi ha res a configurar.\n"
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5656,7 +5616,7 @@ msgstr ""
 "Només hi ha 1 programa que proveeixi %s\n"
 "(%s). No hi ha res a configurar.\n"
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5669,48 +5629,63 @@ msgstr ""
 "  Selecció     Alternativa\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 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:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr "S'utilitzarà «%s» per proveir «%s»."
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "No es pot trobar l'alternativa «%s»."
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, 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:730
+#: scripts/update-alternatives.pl:691
 #, 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:735
+#: scripts/update-alternatives.pl:696
 #, 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:736
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "missing newline after %s"
 msgstr "falta un salt de línia després de %s"
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, 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:715
+#, 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:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Problema seriós: %s"
 
+#~ msgid "unable to ensure %s nonexistent: %s"
+#~ msgstr "no es pot garantir que %s sigui no existent: %s"
+
+#~ msgid ""
+#~ "warning: %s is supposed to be a slave symlink to\n"
+#~ " %s, or nonexistent; however, readlink failed: %s"
+#~ msgstr ""
+#~ "avís: %s hauria de ser un enllaç simbòlic esclau a\n"
+#~ " %s, o no existent; tanmateix, readlink ha fallat: %s"
+
 #~ msgid "warning"
 #~ msgstr "avís"
 
diff --git a/po/cs.po b/po/cs.po
index 82a86e57..52808450 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-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\n"
 "PO-Revision-Date: 2007-11-09 18:34+0100\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -4421,7 +4421,7 @@ msgid "unable to close %s after read: %s"
 msgstr "po čtení nelze zavřít %s: %s"
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "nelze zavřít %s: %s"
@@ -4511,7 +4511,7 @@ msgstr ""
 "divert.\n"
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr "zadány dva příkazy: %s a --%s"
@@ -4535,13 +4535,13 @@ msgid "package may not contain newlines"
 msgstr "jméno balíku nemůže obsahovat znak nového řádku"
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s vyžaduje jako argument <adresář>"
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "neznámá volba \"%s\""
@@ -4640,12 +4640,12 @@ msgstr "nelze volat stat na staré jméno `%s': %s"
 msgid "cannot stat new name `%s': %s"
 msgstr "nelze volat stat na nové jméno `%s': %s"
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "chyba při kontrole `%s': %s"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4654,47 +4654,47 @@ msgstr ""
 "přejmenování znamená přepsání `%s'\n"
 "  souborem `%s', což není povoleno"
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "přejmenování: odstranění duplicitního starého odkazu `%s': %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "přejmenování: přejmenování `%s' na `%s': %s"
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "vytváření souboru diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "zápis souboru diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "zavírání souboru diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "odstranění starého souboru diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "vytvoření nového souboru diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "instalace nového souboru diversions: %s"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "vnitřní chyba: %s porušeno: %s"
@@ -5221,54 +5221,88 @@ msgstr "Nejsou k dispozici žádné verze."
 msgid "Current `best' version is %s."
 msgstr "Momentálně \"nejlepší\" verze je \"%s\"."
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
+#, fuzzy, perl-format
+msgid ""
+"warning: %s is supposed to be a symlink to %s, \n"
+"or nonexistent; however, readlink failed: %s"
+msgstr ""
+"varování: %s má být symbolický odkaz na %s,\n"
+" avšak volání readlink selhalo: %s"
+
+#: scripts/update-alternatives.pl:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr "Ponechávám %s (%s), aby ukazoval na %s."
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
+msgstr "Aktualizuji %s (%s), aby ukazoval na %s."
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr "Používám '%s' pro poskytnutí `%s'. "
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr "Odstraňuji %s (%s), neodpovídá %s."
+
+#: scripts/update-alternatives.pl:288
+#, perl-format
+msgid "unable to remove %s: %s"
+msgstr "nelze odstranit %s: %s"
+
+#: scripts/update-alternatives.pl:301
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "neznámý argument `%s'"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install vyžaduje <odkaz> <jméno> <cesta> <priorita>"
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr "priorita musí být celé číslo"
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s vyžaduje <jméno> <cesta>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s vyžaduje <jméno>"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave vyžaduje <odkaz> <jméno> <cesta>"
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "závislé jméno %s je duplicitní"
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "závislý odkaz %s je duplicitní"
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, 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:293
+#: scripts/update-alternatives.pl:351
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "odkaz %s je jak primární, tak závislý"
 
-#: scripts/update-alternatives.pl:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5276,31 +5310,21 @@ msgstr ""
 "vyžaduji --display, --config, --set, --install, --remove, --all, --remove-"
 "all nebo --auto"
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr "--slave je povoleno jen současně s --install"
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Pro %s neexistují žádné alternativy."
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Nastavuji automatický výběr %s."
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, perl-format
-msgid "unable to remove %s: %s"
-msgstr "nelze odstranit %s: %s"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5309,7 +5333,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:386
+#: scripts/update-alternatives.pl:442
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5318,125 +5342,69 @@ 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:392
+#: scripts/update-alternatives.pl:448
 #, 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:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "nelze přejmenovat %s na %s: %s"
 
-#: scripts/update-alternatives.pl:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "závislý odkaz jménem %s byl duplikován"
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, 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:433
+#: scripts/update-alternatives.pl:489
 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:447
+#: scripts/update-alternatives.pl:503
 #, 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:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Zahazuji zastaralý závislý odkaz %s (%s)."
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, 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:497
+#: scripts/update-alternatives.pl:551
 #, 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:501
+#: scripts/update-alternatives.pl:555
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Obnovuji z předchozí nefunkční aktualizace %s ..."
 
-#: scripts/update-alternatives.pl:516
+#: scripts/update-alternatives.pl:569
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "nelze otevřít %s pro zápis: %s"
 
-#: scripts/update-alternatives.pl:539
+#: scripts/update-alternatives.pl:592
 #, 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:553
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a symlink to %s\n"
-" (or nonexistent); however, readlink failed: %s"
-msgstr ""
-"varování: %s má být symbolický odkaz na %s,\n"
-" avšak volání readlink selhalo: %s"
-
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr "nelze se přesvědčit, že %s neexistuje: %s"
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, 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:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, perl-format
-msgid "unable to install %s as %s: %s"
-msgstr "nelze nainstalovat %s jako %s: %s"
-
-#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr "Ponechávám %s (%s), aby ukazoval na %s."
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr "Aktualizuji %s (%s), aby ukazoval na %s."
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr "Odstraňuji %s (%s), neodpovídá %s."
-
-#: scripts/update-alternatives.pl:600
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a slave symlink to\n"
-" %s, or nonexistent; however, readlink failed: %s"
-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:634
+#: scripts/update-alternatives.pl:631
 #, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5445,7 +5413,7 @@ msgstr ""
 "Neexistuje program poskytující %s.\n"
 "Nemám nic k nastavení.\n"
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5454,7 +5422,7 @@ msgstr ""
 "Existuje pouze jediný program poskytující %s\n"
 "(%s). Nemám nic k nastavení.\n"
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5467,45 +5435,60 @@ msgstr ""
 "  Výběr        Alternativa\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 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:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr "Používám '%s' pro poskytnutí `%s'. "
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Nemohu najít alternativu `%s'."
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "chyba při zápisu na standardní výstup: %s"
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, 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:735
+#: scripts/update-alternatives.pl:696
 #, 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:736
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "missing newline after %s"
 msgstr "chybí nový řádek za %s"
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, 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:715
+#, perl-format
+msgid "unable to install %s as %s: %s"
+msgstr "nelze nainstalovat %s jako %s: %s"
+
+#: scripts/update-alternatives.pl:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Vážný problém: %s"
 
+#~ msgid "unable to ensure %s nonexistent: %s"
+#~ msgstr "nelze se přesvědčit, že %s neexistuje: %s"
+
+#~ msgid ""
+#~ "warning: %s is supposed to be a slave symlink to\n"
+#~ " %s, or nonexistent; however, readlink failed: %s"
+#~ msgstr ""
+#~ "varování: %s má být záviský symbolický odkaz na\n"
+#~ " %s, avšak volání readlink selhalo: %s"
+
 #~ msgid "warning"
 #~ msgstr "varování"
 
diff --git a/po/da.po b/po/da.po
index 074bfedd..bd114eae 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-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\n"
 "PO-Revision-Date: 2007-09-06 22:02+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
 "Language-Team: Danish\n"
@@ -4466,7 +4466,7 @@ msgid "unable to close %s after read: %s"
 msgstr "kunne ikke lukke %s efter læsning: %s"
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "kunne ikke lukke %s: %s"
@@ -4556,7 +4556,7 @@ msgstr ""
 "Pakkescripterne preinst/postrm skal altid angive --package og --divert.\n"
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr "to kommandoer angivet: %s og --%s"
@@ -4580,13 +4580,13 @@ msgid "package may not contain newlines"
 msgstr "pakke må ikke indeholde linjeskift"
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s kræver et <mappe>-parameter"
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "ukendt tilvalg '%s'"
@@ -4685,12 +4685,12 @@ msgstr "kan ikke finde det gamle navn '%s': %s"
 msgid "cannot stat new name `%s': %s"
 msgstr "kan ikke finde det nye navn '%s': %s"
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "fejl under tjek af '%s': %s"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4699,47 +4699,47 @@ msgstr ""
 "omdøbning medfører overskrivning af '%s' med\n"
 "  anden fil `%s', ikke tilladt"
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "omdøb: fjern identisk gammel lænke '%s': %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "omdøb: omdøb '%s' til '%s': %s"
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "opret diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "skriv diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "luk diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "fjern gammel diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "opret ny diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "installér nye omrokeringer: %s"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "intern fejl:'%s ugyldig: %s"
@@ -5272,54 +5272,88 @@ msgstr "Ingen tilg
 msgid "Current `best' version is %s."
 msgstr "Den bedste aktuelle version er  %s."
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
+#, fuzzy, perl-format
+msgid ""
+"warning: %s is supposed to be a symlink to %s, \n"
+"or nonexistent; however, readlink failed: %s"
+msgstr ""
+"advarsel: %s burde være en symbolsk lænke til %s\n"
+" (eller ikke eksisterende), men readlink fejlede: %s"
+
+#: scripts/update-alternatives.pl:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr "Lader fortsat %s (%s) pege på %s."
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
+msgstr "Opdaterer %s (%s) til at pege på %s."
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr "Bruger `%s' til at give '%s'."
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr "Fjernelse af %s (%s), er i modstrid med %s."
+
+#: scripts/update-alternatives.pl:288
+#, perl-format
+msgid "unable to remove %s: %s"
+msgstr "kunne ikke fjerne %s: %s"
+
+#: scripts/update-alternatives.pl:301
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "ukendt parameter '%s'"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install kræver <lænke> <navn> <sti> <prioritet>"
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr "prioritet skal være et heltal"
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s kræver <navn> <sti>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s kræver <navn>"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave kræver <lænke> <navn> <sti>"
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "slavenavnet %s eksisterer flere gange"
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "slavelænken %s eksisterer flere gange"
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "navnet %s er både primær og slave"
 
-#: scripts/update-alternatives.pl:293
+#: scripts/update-alternatives.pl:351
 #, 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:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5327,31 +5361,21 @@ msgstr ""
 "kræver --display, --config, --set, --install, --remove, --all, --remove-all "
 "eller --auto"
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr "--slave er kun tilladt med --install"
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Ingen alternativer til %s."
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Sætter automatisk valg af %s op."
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, perl-format
-msgid "unable to remove %s: %s"
-msgstr "kunne ikke fjerne %s: %s"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5360,7 +5384,7 @@ msgstr ""
 "%s er blevet ændret (manuelt eller af et script).\n"
 "Skifter til rent manuelle opdateringer."
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5369,124 +5393,68 @@ 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:392
+#: scripts/update-alternatives.pl:448
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Omdøber %s-lænke fra %s til %s."
 
-#: scripts/update-alternatives.pl:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "kunne ikke omdøbe %s til %s: %s"
 
-#: scripts/update-alternatives.pl:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "slavelænkenavnet %s findes flere gange"
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, 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:433
+#: scripts/update-alternatives.pl:489
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "Fjerner manuelt valgt alternativ - skifter til automatisk tilstand"
 
-#: scripts/update-alternatives.pl:447
+#: scripts/update-alternatives.pl:503
 #, 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:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Sletter den forældede slavelænke %s (%s)."
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, 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:497
+#: scripts/update-alternatives.pl:551
 #, 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:501
+#: scripts/update-alternatives.pl:555
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Genskaber fra tidligere mislykkede opdatering af '%s ..."
 
-#: scripts/update-alternatives.pl:516
+#: scripts/update-alternatives.pl:569
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "kunne ikke åbne %s for skrivning: %s"
 
-#: scripts/update-alternatives.pl:539
+#: scripts/update-alternatives.pl:592
 #, 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:553
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a symlink to %s\n"
-" (or nonexistent); however, readlink failed: %s"
-msgstr ""
-"advarsel: %s burde være en symbolsk lænke til %s\n"
-" (eller ikke eksisterende), men readlink fejlede: %s"
-
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr "kunne ikke sikre at %s ikke fandtes: %s"
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, 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:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, perl-format
-msgid "unable to install %s as %s: %s"
-msgstr "kunne ikke installere %s som %s: %s"
-
-#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr "Lader fortsat %s (%s) pege på %s."
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr "Opdaterer %s (%s) til at pege på %s."
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr "Fjernelse af %s (%s), er i modstrid med %s."
-
-#: scripts/update-alternatives.pl:600
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a slave symlink to\n"
-" %s, or nonexistent; however, readlink failed: %s"
-msgstr ""
-"advarsel: %s burde være en symbolsk slave-lænke til\n"
-" %s, eller ikke eksistere. readlink mislykkedes: %s"
-
-#: scripts/update-alternatives.pl:634
+#: scripts/update-alternatives.pl:631
 #, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5495,7 +5463,7 @@ msgstr ""
 "Der er intet program, der giver %s\n"
 "Intet at sætte op.\n"
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5504,7 +5472,7 @@ msgstr ""
 "Der er kun et enkelt program, der giver %s\n"
 "(%s). Intet at sætte op.\n"
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5517,47 +5485,62 @@ msgstr ""
 "  Valg         Alternativ\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 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:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr "Bruger `%s' til at give '%s'."
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Kan ikke finde alternativet '%s'."
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "fejl under skrivning til standard-ud: %s"
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "linjeskift er ikke tilladt i update-alternatives-filer (%s)"
 
-#: scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:696
 #, 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:736
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "missing newline after %s"
 msgstr "manglende linjeskift efter %s"
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, 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:715
+#, perl-format
+msgid "unable to install %s as %s: %s"
+msgstr "kunne ikke installere %s som %s: %s"
+
+#: scripts/update-alternatives.pl:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Alvorligt problem: %s"
 
+#~ msgid "unable to ensure %s nonexistent: %s"
+#~ msgstr "kunne ikke sikre at %s ikke fandtes: %s"
+
+#~ msgid ""
+#~ "warning: %s is supposed to be a slave symlink to\n"
+#~ " %s, or nonexistent; however, readlink failed: %s"
+#~ msgstr ""
+#~ "advarsel: %s burde være en symbolsk slave-lænke til\n"
+#~ " %s, eller ikke eksistere. readlink mislykkedes: %s"
+
 #~ msgid "warning"
 #~ msgstr "advarsel"
 
diff --git a/po/de.po b/po/de.po
index 005c060a..65121d69 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.14.6\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\n"
 "PO-Revision-Date: 2007-11-01 13:32+0100\n"
 "Last-Translator: Sven Joachim <svenjoac@gmx.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -758,8 +758,7 @@ msgstr ""
 #: lib/parse.c:188
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
-msgstr ""
-"EOF im Wert des Feldes »%.*s« (fehlender abschließender Zeilenvorschub)"
+msgstr "EOF im Wert des Feldes »%.*s« (fehlender abschließender Zeilenvorschub)"
 
 #: lib/parse.c:211
 #, c-format
@@ -1037,8 +1036,7 @@ msgstr "Fehler beim Erstellen des Verzeichnisses »%.255s«"
 #: src/archives.c:758
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
-msgstr ""
-"Kann »%.255s« nicht aus dem Weg räumen, um neue Version zu installieren"
+msgstr "Kann »%.255s« nicht aus dem Weg räumen, um neue Version zu installieren"
 
 #: src/archives.c:767
 #, c-format
@@ -1388,8 +1386,7 @@ msgstr "dpkg: %s: Warnung - konnte »%.250s« nicht löschen: %s\n"
 #, c-format
 msgid "dpkg: %s: warning - failed to remove old distrib version `%.250s': %s\n"
 msgstr ""
-"dpkg: %s: Warnung - konnte alte verteilte Version »%.250s« nicht löschen: %"
-"s\n"
+"dpkg: %s: Warnung - konnte alte verteilte Version »%.250s« nicht löschen: %s\n"
 
 #: src/configure.c:262
 #, c-format
@@ -1400,8 +1397,7 @@ msgstr ""
 #: src/configure.c:267
 #, c-format
 msgid "dpkg: %s: warning - failed to link `%.250s' to `%.250s': %s\n"
-msgstr ""
-"dpkg: %s: Warnung - konnte »%.250s« nicht mit »%.250s« verknüpfen: %s\n"
+msgstr "dpkg: %s: Warnung - konnte »%.250s« nicht mit »%.250s« verknüpfen: %s\n"
 
 #: src/configure.c:271
 #, c-format
@@ -1948,8 +1944,8 @@ msgid ""
 "dpkg: serious warning: files list file for package `%.250s' missing, "
 "assuming package has no files currently installed.\n"
 msgstr ""
-"dpkg: Ernste Warnung: Dateilisten-Datei des Paketes »%.250s« fehlt, nehme "
-"an, dass das Paket derzeit keine Dateien installiert hat.\n"
+"dpkg: Ernste Warnung: Dateilisten-Datei des Paketes »%.250s« fehlt, nehme an, "
+"dass das Paket derzeit keine Dateien installiert hat.\n"
 
 #: src/filesdb.c:145
 #, c-format
@@ -2943,8 +2939,8 @@ msgid ""
 "dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
 "%.250s' and `%.250s')\n"
 msgstr ""
-"dpkg: Warnung - alte Datei »%.250s« ist die gleiche wie mehrere neue "
-"Dateien! (sowohl »%.250s« als auch »%.250s«)\n"
+"dpkg: Warnung - alte Datei »%.250s« ist die gleiche wie mehrere neue Dateien! "
+"(sowohl »%.250s« als auch »%.250s«)\n"
 
 #: src/processarc.c:725
 #, c-format
@@ -2980,8 +2976,7 @@ msgstr "Kann temporäres Control-Verzeichnis nicht öffnen"
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
-"Paket enthält übermäßig langen Control-Info-Dateinamen (beginnend mit "
-"»%.50s«)"
+"Paket enthält übermäßig langen Control-Info-Dateinamen (beginnend mit »%.50s«)"
 
 #: src/processarc.c:800
 #, c-format
@@ -2992,8 +2987,8 @@ msgstr "Paket-Control-Info enthielt Verzeichnis »%.250s«"
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr ""
-"Paket-Control-Info rmdir von »%.250s« ergab nicht, dass dies kein "
-"Verzeichnis sei"
+"Paket-Control-Info rmdir von »%.250s« ergab nicht, dass dies kein Verzeichnis "
+"sei"
 
 #: src/processarc.c:808
 #, c-format
@@ -3261,8 +3256,8 @@ msgid ""
 "dpkg - warning: while removing %.250s, unable to remove directory `%.250s': %"
 "s - directory may be a mount point ?\n"
 msgstr ""
-"dpkg - Warnung: Während Entfernens von %.250s kann Verzeichnis »%.250s« "
-"nicht gelöscht werden: %s - Verzeichnis vielleicht ein Einhängepunkt?\n"
+"dpkg - Warnung: Während Entfernens von %.250s kann Verzeichnis »%.250s« nicht "
+"gelöscht werden: %s - Verzeichnis vielleicht ein Einhängepunkt?\n"
 
 #: src/remove.c:265 src/remove.c:382
 #, c-format
@@ -3302,15 +3297,13 @@ msgstr "Kann alte Konfigurationsdatei »%.250s« nicht entfernen (= »%.250s«)"
 #, c-format
 msgid "cannot read config file dir `%.250s' (from `%.250s')"
 msgstr ""
-"Kann das Konfigurationsdateien-Verzeichnis »%.250s« nicht lesen (aus "
-"»%.250s«)"
+"Kann das Konfigurationsdateien-Verzeichnis »%.250s« nicht lesen (aus »%.250s«)"
 
 #: src/remove.c:505
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
 msgstr ""
-"Kann alte Konfigurations-Sicherungsdatei »%.250s« nicht löschen (aus "
-"»%.250s«)"
+"Kann alte Konfigurations-Sicherungsdatei »%.250s« nicht löschen (aus »%.250s«)"
 
 #: src/remove.c:541
 #, c-format
@@ -4083,8 +4076,7 @@ msgstr "Datei »%.250s« ist kaputt - Nullen im Info-Bereich"
 #, c-format
 msgid "file `%.250s' is format version `%.250s' - you need a newer dpkg-split"
 msgstr ""
-"Datei »%.250s« hat Formatversion »%.250s« - Sie brauchen ein neueres dpkg-"
-"split"
+"Datei »%.250s« hat Formatversion »%.250s« - Sie brauchen ein neueres dpkg-split"
 
 #: dpkg-split/info.c:124
 #, c-format
@@ -4094,8 +4086,7 @@ msgstr "Datei »%.250s« ist kaputt - falsche MD5-Prüfsumme »%.250s«"
 #: dpkg-split/info.c:131
 #, c-format
 msgid "file `%.250s' is corrupt - no slash between part numbers"
-msgstr ""
-"Datei »%.250s« ist kaputt - kein Schrägstrich zwischen den Teil-Nummern"
+msgstr "Datei »%.250s« ist kaputt - kein Schrägstrich zwischen den Teil-Nummern"
 
 #: dpkg-split/info.c:140
 #, c-format
@@ -4529,7 +4520,7 @@ msgid "unable to close %s after read: %s"
 msgstr "Kann %s nach dem Lesen nicht schließen: %s"
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "Kann %s nicht schließen: %s"
@@ -4621,7 +4612,7 @@ msgstr ""
 "und --divert angeben.\n"
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr "Zwei Befehle angegeben: %s und --%s"
@@ -4645,13 +4636,13 @@ msgid "package may not contain newlines"
 msgstr "Paketname darf keine Zeilenvorschübe enthalten"
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s benötigt ein Verzeichnis als Argument"
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "unbekannte Option »%s«"
@@ -4750,12 +4741,12 @@ msgstr "Kann kein stat auf alten Namen »%s« durchführen: %s"
 msgid "cannot stat new name `%s': %s"
 msgstr "Kann kein stat auf neuen Namen »%s« durchführen: %s"
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "Fehler beim Überprüfen von »%s«: %s"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4764,47 +4755,47 @@ msgstr ""
 "Umbenennen beinhaltet Überschreiben von »%s« mit\n"
 "  anderer Datei »%s«, nicht erlaubt"
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "rename: Entfernen des doppelten alten Links »%s«: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "rename: Umbenennen von »%s« nach »%s«: %s"
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "Anlegen von diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "Schreiben von diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "Schließen von diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "Entfernen von alter diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "Anlegen von neuer diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "Installieren von neuer diversions: %s"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "interner Fehler: %s defekt: %s"
@@ -5337,54 +5328,88 @@ msgstr "Keine Versionen verfügbar."
 msgid "Current `best' version is %s."
 msgstr "Gegenwärtig »beste« Version ist %s."
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
+#, fuzzy, perl-format
+msgid ""
+"warning: %s is supposed to be a symlink to %s, \n"
+"or nonexistent; however, readlink failed: %s"
+msgstr ""
+"Warnung: %s sollte ein symbolischer Link auf %s sein\n"
+" (oder nicht existent); jedoch schlug readlink fehl: %s"
+
+#: scripts/update-alternatives.pl:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr "Lasse %s (%s) weiterhin auf %s verweisen."
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
+msgstr "Aktualisiere %s (%s), auf %s zu verweisen."
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr "Verwende »%s«, um »%s« bereitzustellen."
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr "Entferne %s (%s), nicht angebracht mit %s."
+
+#: scripts/update-alternatives.pl:288
+#, perl-format
+msgid "unable to remove %s: %s"
+msgstr "Kann %s nicht entfernen: %s"
+
+#: scripts/update-alternatives.pl:301
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "unbekanntes Argument »%s«"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install benötigt <Link> <Name> <Pfad> <Priorität>"
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr "Priorität muss eine Ganzzahl sein"
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s benötigt <Name> <Pfad>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s benötigt <Name>"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave benötigt <Link> <Name> <Pfad>"
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "doppelter Slave-Name %s"
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "doppelter Slave-Link %s"
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "Name %s ist sowohl primär als auch slave"
 
-#: scripts/update-alternatives.pl:293
+#: scripts/update-alternatives.pl:351
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "Link %s ist sowohl primär als auch slave"
 
-#: scripts/update-alternatives.pl:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5392,31 +5417,21 @@ msgstr ""
 "brauche --display, --config, --set, --install, --remove, --all, --remove-all "
 "oder --auto"
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr "--slave ist nur mit --install erlaubt"
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Keine Alternativen für %s."
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Richte automatische Auswahl von %s ein."
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, perl-format
-msgid "unable to remove %s: %s"
-msgstr "Kann %s nicht entfernen: %s"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5425,7 +5440,7 @@ msgstr ""
 "%s wurde geändert (manuell oder von einem Skript).\n"
 "Wechsle zu ausschließlich manuellen Aktualisierungen."
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5435,125 +5450,69 @@ msgstr ""
 "(Sie können die symbolischen Links dort selbst ändern, falls gewünscht - "
 "siehe »man ln«.)"
 
-#: scripts/update-alternatives.pl:392
+#: scripts/update-alternatives.pl:448
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Benenne %s-Link von %s in %s um."
 
-#: scripts/update-alternatives.pl:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "Kann %s nicht in %s umbenennen: %s"
 
-#: scripts/update-alternatives.pl:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "Slave-Link Name %s doppelt"
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, 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:433
+#: scripts/update-alternatives.pl:489
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "Entferne manuell ausgewählte Alternative - wechsle zu Auto-Modus"
 
-#: scripts/update-alternatives.pl:447
+#: scripts/update-alternatives.pl:503
 #, 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:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Verwerfe veralteten Slave-Link %s (%s)."
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, 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:497
+#: scripts/update-alternatives.pl:551
 #, 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:501
+#: scripts/update-alternatives.pl:555
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Behebe zuvor fehlgeschlagene Aktualisierung von %s ..."
 
-#: scripts/update-alternatives.pl:516
+#: scripts/update-alternatives.pl:569
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "Kann %s nicht zum Schreiben öffnen: %s"
 
-#: scripts/update-alternatives.pl:539
+#: scripts/update-alternatives.pl:592
 #, 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:553
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a symlink to %s\n"
-" (or nonexistent); however, readlink failed: %s"
-msgstr ""
-"Warnung: %s sollte ein symbolischer Link auf %s sein\n"
-" (oder nicht existent); jedoch schlug readlink fehl: %s"
-
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr "Kann nicht sicherstellen, dass %s nicht existiert: %s"
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, 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:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, perl-format
-msgid "unable to install %s as %s: %s"
-msgstr "Kann %s nicht als %s installieren: %s"
-
-#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr "Lasse %s (%s) weiterhin auf %s verweisen."
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr "Aktualisiere %s (%s), auf %s zu verweisen."
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr "Entferne %s (%s), nicht angebracht mit %s."
-
-#: scripts/update-alternatives.pl:600
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a slave symlink to\n"
-" %s, or nonexistent; however, readlink failed: %s"
-msgstr ""
-"Warnung: %s sollte ein symbolischer Slave-Link auf\n"
-" %s sein oder nicht existieren; jedoch schlug readlink fehl: %s"
-
-#: scripts/update-alternatives.pl:634
+#: scripts/update-alternatives.pl:631
 #, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5562,7 +5521,7 @@ msgstr ""
 "Es gibt kein Programm, welches %s bereitstellt.\n"
 "Nichts zu konfigurieren.\n"
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5571,7 +5530,7 @@ msgstr ""
 "Es gibt nur 1 Programm, welches %s bereitstellt\n"
 "(%s). Nichts zu konfigurieren.\n"
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5584,43 +5543,58 @@ msgstr ""
 "  Auswahl      Alternative\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 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:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr "Verwende »%s«, um »%s« bereitzustellen."
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Kann Alternative »%s« nicht finden."
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "Fehler beim Schreiben auf Standardausgabe: %s"
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "Zeilenvorschübe sind in update-alternatives-Dateien (%s) verboten"
 
-#: scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:696
 #, 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:736
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "missing newline after %s"
 msgstr "fehlender Zeilenvorschub nach %s"
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, 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:715
+#, perl-format
+msgid "unable to install %s as %s: %s"
+msgstr "Kann %s nicht als %s installieren: %s"
+
+#: scripts/update-alternatives.pl:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Schwerwiegendes Problem: %s"
+
+#~ msgid "unable to ensure %s nonexistent: %s"
+#~ msgstr "Kann nicht sicherstellen, dass %s nicht existiert: %s"
+
+#~ msgid ""
+#~ "warning: %s is supposed to be a slave symlink to\n"
+#~ " %s, or nonexistent; however, readlink failed: %s"
+#~ msgstr ""
+#~ "Warnung: %s sollte ein symbolischer Slave-Link auf\n"
+#~ " %s sein oder nicht existieren; jedoch schlug readlink fehl: %s"
diff --git a/po/dpkg.pot b/po/dpkg.pot
index 78ac67cd..d3175d43 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-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\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"
@@ -4011,7 +4011,7 @@ msgid "unable to close %s after read: %s"
 msgstr ""
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr ""
@@ -4074,7 +4074,7 @@ msgid ""
 msgstr ""
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr ""
@@ -4098,13 +4098,13 @@ msgid "package may not contain newlines"
 msgstr ""
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr ""
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, perl-format
 msgid "unknown option `%s'"
 msgstr ""
@@ -4197,59 +4197,59 @@ msgstr ""
 msgid "cannot stat new name `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
 "  different file `%s', not allowed"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, perl-format
 msgid "install new diversions: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr ""
@@ -4692,223 +4692,193 @@ msgstr ""
 msgid "Current `best' version is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
 #, perl-format
-msgid "unknown argument `%s'"
+msgid ""
+"warning: %s is supposed to be a symlink to %s, \n"
+"or nonexistent; however, readlink failed: %s"
+msgstr ""
+
+#: scripts/update-alternatives.pl:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr ""
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
 msgstr ""
 
 #: scripts/update-alternatives.pl:256
+#, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr ""
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr ""
+
+#: scripts/update-alternatives.pl:288
+#, perl-format
+msgid "unable to remove %s: %s"
+msgstr ""
+
+#: scripts/update-alternatives.pl:301
+#, perl-format
+msgid "unknown argument `%s'"
+msgstr ""
+
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr ""
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, perl-format
 msgid "--%s needs <name>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:293
+#: scripts/update-alternatives.pl:351
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
 msgstr ""
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr ""
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, perl-format
-msgid "unable to remove %s: %s"
-msgstr ""
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
 "Switching to manual updates only."
 msgstr ""
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, 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:392
+#: scripts/update-alternatives.pl:448
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:489
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 
-#: scripts/update-alternatives.pl:447
+#: scripts/update-alternatives.pl:503
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: scripts/update-alternatives.pl:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr ""
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr ""
 
-#: scripts/update-alternatives.pl:497
+#: scripts/update-alternatives.pl:551
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:501
+#: scripts/update-alternatives.pl:555
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr ""
 
-#: scripts/update-alternatives.pl:516
+#: scripts/update-alternatives.pl:569
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:539
+#: scripts/update-alternatives.pl:592
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr ""
 
-#: scripts/update-alternatives.pl:553
-#, 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:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr ""
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, perl-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr ""
-
-#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, perl-format
-msgid "unable to install %s as %s: %s"
-msgstr ""
-
-#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr ""
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr ""
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr ""
-
-#: scripts/update-alternatives.pl:600
-#, 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:634
+#: scripts/update-alternatives.pl:631
 #, perl-format
 msgid ""
 "There is no program which provides %s.\n"
 "Nothing to configure.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
 "(%s). Nothing to configure.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -4917,41 +4887,46 @@ msgid ""
 "-----------------------------------------------\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 
-#: scripts/update-alternatives.pl:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr ""
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:696
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:736
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "missing newline after %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, perl-format
+msgid "unable to make %s a symlink to %s: %s"
+msgstr ""
+
+#: scripts/update-alternatives.pl:715
+#, perl-format
+msgid "unable to install %s as %s: %s"
+msgstr ""
+
+#: scripts/update-alternatives.pl:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr ""
diff --git a/po/dz.po b/po/dz.po
index 2bfb636d..46cc580c 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-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\n"
 "PO-Revision-Date: 2007-06-29 04:06+0530\n"
 "Last-Translator: Tshewang Norbu <bumthap2006@hotmail.com>\n"
 "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -4471,7 +4471,7 @@ msgid "unable to close %s after read: %s"
 msgstr " %sལྷག་ཚར་བའི་ཤུལ་མ་ %s ཁ་བསྡམས་མ་ཚུགས།"
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "%s ཁ་བསྡམ་མ་ཚུགས་: %s"
@@ -4563,7 +4563,7 @@ msgstr ""
 "གསལ་བཀོད་འབད་དགོ།\n"
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr "བརྡ་བཀོད་གཉིས་གསལ་བཀོད་འབད་ཡོདཔ: %s དང་ --%s"
@@ -4587,13 +4587,13 @@ msgid "package may not contain newlines"
 msgstr "ཐུམ་སྒྲིལ་ལུ་གྲལ་ཐིག་གསརཔ་མེདཔ་འོང་།"
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s ་ལུ་ <སྣོད་ཐོ་> སྒྲུབ་རྟགས་ཅིག་དགོཔ་འདུག"
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "མ་ཤེས་པའི་གདམ་ཁ་ `%s'"
@@ -4692,12 +4692,12 @@ msgstr "མིང་རྙིངམ་ `%s' སི་ཊེཊི་འབད་
 msgid "cannot stat new name `%s': %s"
 msgstr "མིང་གསརཔ་ `%s' སི་ཊེཊི་འབད་མ་ཚུགས: %s"
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "`%s' ཞིབ་དཔྱད་འབད་ནིའི་འཛོལ་བ: %s"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4706,47 +4706,47 @@ msgstr ""
 "བསྐྱར་མིང་བཏགས་ནི་འདི་ `%s' \n"
 "  ཡིག་སྣོད་ `%s' སོ་སོ་དང་དང་ཅིག་ཁར་ཚབ་སྲུང་འབད་ནི་དང་འབྲེལ་བ་འབདཝ་ཨིན། འབད་མི་ཆོག"
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "བསྐྱར་མིང་བཏགས་: འབྲེལ་ལམ་ `%s' རྙིངམ་རྫུན་མ་རྩ་བསྐྲད་གཏང་: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "བསྐྱར་མིང་བཏགས་:  `%s' འདི་ `%s' ལུ་བསྐྱར་མིང་བཏགས་: %s"
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "ཁ་སྒྱུར་-གསརཔ་གསར་བསྐྲུན་འབད: %s"
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "ཁ་སྒྱུར་-གསརཔ་འབྲི: %s"
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "ཁ་སྒྱུར་-གསརཔ་ཁ་བསྡམ: %s"
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "ཁ་སྒྱུར་རྙིངམ་-རྙིངམ་ རྩ་བསྐྲད་གཏང་: %s"
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "ཁ་སྒྱུར་གསརཔ་-རྙིངམ་གསར་བསྐྲུན་འབད: %s"
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "ཁ་སྒྱུར་གསརཔ་གཞི་བཙུགས་འབད: %s"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "ནང་འཁོད་ཀྱི་འཛོལ་བ: %s ངན་ཅན་བཟོ་ནི་: %s"
@@ -5276,54 +5276,88 @@ msgstr "ཐོན་རིམ་ཚུ་ཐོབ་ཚུགསཔ་མེད
 msgid "Current `best' version is %s."
 msgstr "ད་ལྟོའི་ཐོན་རིམ་`དྲག་ཤོས་'འདི་ %s ཨིན།"
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
+#, fuzzy, perl-format
+msgid ""
+"warning: %s is supposed to be a symlink to %s, \n"
+"or nonexistent; however, readlink failed: %s"
+msgstr ""
+"ཉེན་བརྡ་: %s འདི་ %s ལུ་བརྡ་མཚོན་འབྲེལ་ལམ་ཅིག་ཨིན་དགོཔ་ཨིན་\n"
+"(ཡང་ན་གནས་པ་མིན་པ་) གང་ལྟར་ཡང་ རིཌི་ལིངཀ་ འཐུས་ཤོར་འབྱུང་ཡོདཔ: %s"
+
+#: scripts/update-alternatives.pl:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr "%s ལུ་དཔག་མི་ %s (%s) འདི་བཀོག་བཞག་དོ།"
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
+msgstr "%s (%s) འདི་ %s ལུ་དཔག་ནིའི་དོན་ལས་དུས་མཐུན་བཟོ་དོ།"
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr "`%s' བྱིན་ནིའི་དོན་ལས་ `%s' ལག་ལེན་འཐབ་དོ།"
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr "%s (%s)    %s དང་ཅིག་ཁར་འོས་ལྡན་མེན་མི་ རྩ་བསྐྲད་གཏང་དོ།"
+
+#: scripts/update-alternatives.pl:288
+#, perl-format
+msgid "unable to remove %s: %s"
+msgstr "%s རྩ་བསྐྲད་གཏང་མ་ཚུགས: %s"
+
+#: scripts/update-alternatives.pl:301
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "མ་ཤེས་པའི་སྒྲུབ་རྟགས་ `%s'"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--གཞི་བཙུགས་ལུ་ <link> <name> <path> <priority> དགོཔ་ཨིན།"
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr "གཙོ་རིམ་འདི་ཧྲིལ་ཨང་ཅིག་ཨིན་དགོ"
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s ལུ་ <name> <path> དགོཔ་ཨིན།"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s ལུ་ <name> དགོཔ་ཨིན།"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr "--བྲན་གཡོག་ལུ་ <link> <name> <path> དགོཔ་ཨིན།"
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "བྲན་གཡོག་མིང་ %s རྫུན་མ་བཟོ་ཡོདཔ།"
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "བྲན་གཡོག་འབྲེལ་ལམ་ %s རྫུན་མ་བཟོ་ཡོདཔ།"
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "མིང་  %s འདི་གཞི་རིམ་དང་བྲན་གཡོག་གཉིས་ཆ་རང་ཨིན།"
 
-#: scripts/update-alternatives.pl:293
+#: scripts/update-alternatives.pl:351
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "འབྲེལ་ལམ་ %s འདི་ གཞི་རིམ་དང་བྲན་གཡོག་གཉིས་ཆ་རང་ཨིན།"
 
-#: scripts/update-alternatives.pl:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5331,31 +5365,21 @@ msgstr ""
 "--བཀྲམ་སྟོན་ --རིམ་སྒྲིག་ --གཞི་སྒྲིག་ --གཞི་བཙུགས་ --རྩ་བསྐྲད་ --གེ་ར་ --གེ་ར་-རྩ་བསྐྲད་གཏང་ ཡང་"
 "ན་ --རང་བཞིན་ དགོཔ་ཨིན།"
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr "--བྲན་གཡོག་འདི་ --གཞི་བཙུགས་དང་ཅིག་ཁར་རྐྱངམ་ཅིག་འབད་ཆོགཔ་ཨིན།"
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "%s གི་དོན་ལུ་སྤེལ་མ་ཚུ་མེད།"
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "%s གི་རང་བཞིན་སེལ་འཐུ་གཞི་སྒྲིག་འབད་དོ།"
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, perl-format
-msgid "unable to remove %s: %s"
-msgstr "%s རྩ་བསྐྲད་གཏང་མ་ཚུགས: %s"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5364,7 +5388,7 @@ msgstr ""
 "%s འདི་བསྐྱུར་བཅོས་འབད་ཡོདཔ་ཨིན།(ལག་ཐོག་ལས་ཡང་ན་ཡགི་ཚུགས་ཅིག་གིས་སྦེ་)\n"
 "ལག་དེབ་ཀྱི་དུས་མཐུན་ཚུ་ལུ་རྐྱངམ་ཅིག་སུ་ཡུ་ཅིང་འབད་དོ།"
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5374,124 +5398,67 @@ msgstr ""
 "(རེ་འདོད་ཡོདཔ་ཨིན་པ་ཅིན་ ཁྱོད་ཀྱིས་ཁྱོད་རང་གིས་ཕི་ནང་ལུ་བརྡ་མཚོན་འབྲེལ་ལམ་ཚུ་ལེགས་བཅོས་འབད་ཚུགས། -"
 "`man ln' བལྟ།)"
 
-#: scripts/update-alternatives.pl:392
+#: scripts/update-alternatives.pl:448
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "%s འབྲེལ་ལམ་འདི་ %s ལས་ %s ལུ་བསྐྱར་མིང་བཏགས་དོ།"
 
-#: scripts/update-alternatives.pl:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "%s འདི་ %s ལུ་བསྐྱར་མིང་བཏགས་མ་ཚུགས: %s "
 
-#: scripts/update-alternatives.pl:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "བྲན་གཡོག་འབྲེལ་ལམ་མིང་ %s འདི་རྫུན་མ་བཟོ་ཡོདཔ།"
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "%s བྲན་གཡོག་བྲན་ལམ་འདི་ %s ལས་ %s ལུ་བསྐྱར་མིང་བཏགས་དོ།"
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:489
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 "ལག་ཐོག་ལས་སེལ་འཐུ་འབད་ཡོད་པའི་སྤེལ་མ་ - སུ་ཡི་ཅིང་འདི་རང་བཞིན་ཐབས་ལམ་ལུ་རྩ་བསྐྲད་གཏང་དོ།"
 
-#: scripts/update-alternatives.pl:447
+#: scripts/update-alternatives.pl:503
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "%s གི་དོན་ལུ་སྤེལ་མ་ %s འདི་ཐོ་བཀོད་མ་འབད་བས། རྩ་བསྐྲད་མི་གཏང་།"
 
-#: scripts/update-alternatives.pl:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "ཕན་མེད་བྲན་གཡོག་འབྲེལ་ལམ་ %s (%s) བཏོན་བཀོག་དོ།"
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "%s གི་རང་བཞིན་དུས་མཐུན་ཚུ་ལྕོགས་མིན་བཟོ་ཡོད། ཁོ་རང་རྐྱངམ་ཅིག་བཞག་པའི་སྐབས།"
 
-#: scripts/update-alternatives.pl:497
+#: scripts/update-alternatives.pl:551
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr "རང་བཞིན་ཚུ་ལུ་སླར་ལོག་ནིའི་དོན་ལས་  `དུས་མཐུན་-སྤེལ་མ་ --རང་བཞིན %s' ལག་ལེན་འཐབ།"
 
-#: scripts/update-alternatives.pl:501
+#: scripts/update-alternatives.pl:555
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "ཧེ་མའི་ %s གི་འཐུས་ཤོར་འབྱུང་མི་དུས་མཐུན་ལས་སླར་གསོ་འབད་དོ..."
 
-#: scripts/update-alternatives.pl:516
+#: scripts/update-alternatives.pl:569
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "འབྲི་ནིའི་དོན་ལུ་ %s ཁ་ཕྱེ་མ་ཚུགས: %s"
 
-#: scripts/update-alternatives.pl:539
+#: scripts/update-alternatives.pl:592
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "མཇུག་གི་ཐུམ་སྒྲིལ་ %s (%s) བྱིན་མིའདི་རྩ་ཙསྐྲད་གཏང་ཡོདཔ་ དེ་བཏོན་གཏངམ་ད་ལུ།"
 
-#: scripts/update-alternatives.pl:553
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a symlink to %s\n"
-" (or nonexistent); however, readlink failed: %s"
-msgstr ""
-"ཉེན་བརྡ་: %s འདི་ %s ལུ་བརྡ་མཚོན་འབྲེལ་ལམ་ཅིག་ཨིན་དགོཔ་ཨིན་\n"
-"(ཡང་ན་གནས་པ་མིན་པ་) གང་ལྟར་ཡང་ རིཌི་ལིངཀ་ འཐུས་ཤོར་འབྱུང་ཡོདཔ: %s"
-
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr "%s འདི་གནས་པ་མེནམ་སྦེ་ངེས་ཏིག་བཟོ་མ་ཚུགས: %s"
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, perl-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "%s འདི་ %s ལུ་བརྡ་མཚོན་འབྲེལ་ལམ་ཅིག་བཟོ་མ་ཚུགས: %s "
-
-#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, perl-format
-msgid "unable to install %s as %s: %s"
-msgstr "%s འདི་ %s སྦེ་གཞི་བཙུགས་འབད་མ་ཚུགས: %s "
-
-#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr "%s ལུ་དཔག་མི་ %s (%s) འདི་བཀོག་བཞག་དོ།"
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr "%s (%s) འདི་ %s ལུ་དཔག་ནིའི་དོན་ལས་དུས་མཐུན་བཟོ་དོ།"
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr "%s (%s)    %s དང་ཅིག་ཁར་འོས་ལྡན་མེན་མི་ རྩ་བསྐྲད་གཏང་དོ།"
-
-#: scripts/update-alternatives.pl:600
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a slave symlink to\n"
-" %s, or nonexistent; however, readlink failed: %s"
-msgstr ""
-"ཉེན་བརྡ:  %s འདི་ \n"
-"%s ཡང་ན གནས་པ་མིན་པ་ གི་བྲན་གཡོག་བརྡ་མཚོན་འབྲེལ་ལམ་ཨིན་དགོ་ གང་ལྟར་ཡང་ ལྷག་ནིའི་འབྲེལ་ལམ་འཐུས་"
-"ཤོར་འབྱོང་ཡོདཔ: %s"
-
-#: scripts/update-alternatives.pl:634
+#: scripts/update-alternatives.pl:631
 #, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5500,7 +5467,7 @@ msgstr ""
 " བྱིན་མི་ལས་རིམ་ %sའདི་མེད།\n"
 " རིམ་སྒྲིག་འབད་ནི་ག་ཅི་ཡང་མེད།\n"
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5509,7 +5476,7 @@ msgstr ""
 "%s བྱིན་མི་ལས་རིམ་ ༡ རྐྱངམ་ཅིག་ཡོད།\n"
 "(%s)། རིམ་སྒྲིག་འབད་ནི་ག་ཅི་ཡང་མེད།\n"
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5522,45 +5489,61 @@ msgstr ""
 "   སེལ་འཐུ་   སྤེལ་མ\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr "སྔོན་སྒྲིག་[*]བཞག་ནིའི་དོན་ལས་ལོག་ལྡེ་ཨེབ་ ཡང་ན་སེལ་འཐུའི་ཨང་ཡིག་དཔར་རྐྱབས:"
 
-#: scripts/update-alternatives.pl:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr "`%s' བྱིན་ནིའི་དོན་ལས་ `%s' ལག་ལེན་འཐབ་དོ།"
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "སྤེལ་མ་ `%s' འཚོལ་མ་འཐོབ།"
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "stdout འབྲིཝ་ད་འཛོལ་བ: %s"
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "དུས་མཐུན་-སྤེལ་མའི་ཡིག་སྣོད་ཚུ་ (%s) ནང་ལུ་གྲལ་ཐིག་གསརཔ་ཚུ་བཀག་ཡོདཔ།"
 
-#: scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:696
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "%s (%s) གི་དོན་ལུ་ %s ལྷགཔ་ད་འཛོལ་བ་ཡང་ན་ཨི་ཨོ་ཨེཕ།"
 
-#: scripts/update-alternatives.pl:736
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "missing newline after %s"
 msgstr "%s གི་ཤུལ་ལས་གྲལ་ཐིག་གསརཔ་བརླག་སྟོར་ཞུགས་ཡོདཔ།"
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, perl-format
+msgid "unable to make %s a symlink to %s: %s"
+msgstr "%s འདི་ %s ལུ་བརྡ་མཚོན་འབྲེལ་ལམ་ཅིག་བཟོ་མ་ཚུགས: %s "
+
+#: scripts/update-alternatives.pl:715
+#, perl-format
+msgid "unable to install %s as %s: %s"
+msgstr "%s འདི་ %s སྦེ་གཞི་བཙུགས་འབད་མ་ཚུགས: %s "
+
+#: scripts/update-alternatives.pl:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "འཚུབ་ཅན་དཀའ་ངལ: %s"
 
+#~ msgid "unable to ensure %s nonexistent: %s"
+#~ msgstr "%s འདི་གནས་པ་མེནམ་སྦེ་ངེས་ཏིག་བཟོ་མ་ཚུགས: %s"
+
+#~ msgid ""
+#~ "warning: %s is supposed to be a slave symlink to\n"
+#~ " %s, or nonexistent; however, readlink failed: %s"
+#~ msgstr ""
+#~ "ཉེན་བརྡ:  %s འདི་ \n"
+#~ "%s ཡང་ན གནས་པ་མིན་པ་ གི་བྲན་གཡོག་བརྡ་མཚོན་འབྲེལ་ལམ་ཨིན་དགོ་ གང་ལྟར་ཡང་ ལྷག་ནིའི་འབྲེལ་ལམ་"
+#~ "འཐུས་ཤོར་འབྱོང་ཡོདཔ: %s"
+
 #~ msgid "warning"
 #~ msgstr "ཉེན་བརྡ།"
 
diff --git a/po/el.po b/po/el.po
index e0ce670e..d08992c2 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-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\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"
@@ -4438,7 +4438,7 @@ msgid "unable to close %s after read: %s"
 msgstr "αποτυχία κλεισίματος μετά την ανάγνωση: `%.255s'"
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, fuzzy, perl-format
 msgid "unable to close %s: %s"
 msgstr "αδύνατη η εκτέλεση %s"
@@ -4501,7 +4501,7 @@ msgid ""
 msgstr ""
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr ""
@@ -4526,13 +4526,13 @@ msgid "package may not contain newlines"
 msgstr "Το πακέτο `%s' δεν περιέχει κανένα αρχείο (!)\n"
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, fuzzy, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "η --build χρειάζεται ένα όρισμα καταλόγου"
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, fuzzy, perl-format
 msgid "unknown option `%s'"
 msgstr "άγνωστη επιλογή --%s"
@@ -4628,61 +4628,61 @@ msgstr "αδύνατη η εύρεση κατάστασης (stat) του `%.255
 msgid "cannot stat new name `%s': %s"
 msgstr "αδύνατη η εύρεση κατάστασης (stat) του `%.255s' (στο `%.255s')"
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, fuzzy, perl-format
 msgid "error checking `%s': %s"
 msgstr "σφάλμα κατά την εγγραφή `%s'"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
 "  different file `%s', not allowed"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, fuzzy, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr ""
 "dpkg: %s: προειδοποίηση - αποτυχία μετονομασίας του `%.250s' σε `%.250s': %"
 "s\n"
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, fuzzy, perl-format
 msgid "create diversions-new: %s"
 msgstr "σφάλμα ανάγνωσης στο αρχείο diversions [i]"
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, fuzzy, perl-format
 msgid "write diversions-new: %s"
 msgstr "παράκαμψη από %s"
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, fuzzy, perl-format
 msgid "close diversions-new: %s"
 msgstr "παράκαμψη από %s"
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, fuzzy, perl-format
 msgid "create new diversions-old: %s"
 msgstr "σφάλμα ανάγνωσης στο αρχείο diversions [i]"
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, fuzzy, perl-format
 msgid "install new diversions: %s"
 msgstr "αδύνατη η εγκατάσταση της νέας έκδοσης του `%.255s'"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, fuzzy, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "%s: εσωτερικό σφάλμα gzip: εγγραφή: `%s'"
@@ -5128,223 +5128,193 @@ msgstr "(χωρίς διαθέσιμη περιγραφή)"
 msgid "Current `best' version is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
+#, 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:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr ""
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
+msgstr ""
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr "%s (υποδιεργασία): %s\n"
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr ""
+
+#: scripts/update-alternatives.pl:288
+#, fuzzy, perl-format
+msgid "unable to remove %s: %s"
+msgstr "αδύνατη η εκτέλεση %s"
+
+#: scripts/update-alternatives.pl:301
 #, fuzzy, perl-format
 msgid "unknown argument `%s'"
 msgstr "άγνωστος τύπος συμπίεσης '%s'!"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr ""
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, fuzzy, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "η --%s χρειάζεται ένα όρισμα ονόματος αρχείου .deb"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, fuzzy, perl-format
 msgid "--%s needs <name>"
 msgstr "η --%s δεν παίρνει ορίσματα"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:293
+#: scripts/update-alternatives.pl:351
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
 msgstr ""
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr ""
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, fuzzy, perl-format
-msgid "unable to remove %s: %s"
-msgstr "αδύνατη η εκτέλεση %s"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
 "Switching to manual updates only."
 msgstr ""
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, 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:392
+#: scripts/update-alternatives.pl:448
 #, fuzzy, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Γίνεται αποσυμπίεση %s (από %s) ...\n"
 
-#: scripts/update-alternatives.pl:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, fuzzy, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "αδύνατη η εύρεση κατάστασης του %s `%.250s'"
 
-#: scripts/update-alternatives.pl:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:489
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 
-#: scripts/update-alternatives.pl:447
+#: scripts/update-alternatives.pl:503
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: scripts/update-alternatives.pl:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr ""
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr ""
 
-#: scripts/update-alternatives.pl:497
+#: scripts/update-alternatives.pl:551
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:501
+#: scripts/update-alternatives.pl:555
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr ""
 
-#: scripts/update-alternatives.pl:516
+#: scripts/update-alternatives.pl:569
 #, fuzzy, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "αδύνατο το άνοιγμα του αρχείου πηγής `%.250s'"
 
-#: scripts/update-alternatives.pl:539
+#: scripts/update-alternatives.pl:592
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr ""
 
-#: scripts/update-alternatives.pl:553
-#, 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:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, fuzzy, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr "αδύνατη η εκτέλεση νέου %s"
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, fuzzy, perl-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "αδυναμία δημιουργίας εφεδρικού δεσμού για `%.255s'"
-
-#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, fuzzy, perl-format
-msgid "unable to install %s as %s: %s"
-msgstr "αδύνατη η εγκατάσταση `%.250s' ως `%.250s'"
-
-#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr ""
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr ""
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr ""
-
-#: scripts/update-alternatives.pl:600
-#, 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:634
+#: scripts/update-alternatives.pl:631
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
 "Nothing to configure.\n"
 msgstr "  %.250s παρέχει %.250s αλλά πρόκειται να απορρυθμιστεί.\n"
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
 "(%s). Nothing to configure.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5353,46 +5323,55 @@ msgid ""
 "-----------------------------------------------\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 
-#: scripts/update-alternatives.pl:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr ""
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, fuzzy, perl-format
 msgid "error writing stdout: %s"
 msgstr "σφάλμα κατά την εγγραφή `%s'"
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:696
 #, fuzzy, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "σφάλμα ανάγνωσης του %s από %.255s"
 
-#: scripts/update-alternatives.pl:736
+#: scripts/update-alternatives.pl:698
 #, fuzzy, perl-format
 msgid "missing newline after %s"
 msgstr ""
 "το αρχείο `%.250s' είναι κατεστραμμένο - αγνοείται newline μετά το %.250s"
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, fuzzy, perl-format
+msgid "unable to make %s a symlink to %s: %s"
+msgstr "αδυναμία δημιουργίας εφεδρικού δεσμού για `%.255s'"
+
+#: scripts/update-alternatives.pl:715
+#, fuzzy, perl-format
+msgid "unable to install %s as %s: %s"
+msgstr "αδύνατη η εγκατάσταση `%.250s' ως `%.250s'"
+
+#: scripts/update-alternatives.pl:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr ""
 
+#, fuzzy
+#~ msgid "unable to ensure %s nonexistent: %s"
+#~ msgstr "αδύνατη η εκτέλεση νέου %s"
+
 #~ msgid "warning"
 #~ msgstr "προειδοποίηση"
 
diff --git a/po/es.po b/po/es.po
index fe43f965..746b5c34 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-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\n"
 "PO-Revision-Date: 2007-12-18 21:50+0100\n"
 "Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -3984,6 +3984,7 @@ msgid "failed to exec rm -rf"
 msgstr "fallo al ejecutar rm -rf"
 
 #: dpkg-deb/info.c:99
+#, c-format
 msgid "realloc failed (%lu bytes)"
 msgstr "fallo en realloc (%lu bytes)"
 
@@ -4654,7 +4655,7 @@ msgid "unable to close %s after read: %s"
 msgstr "fallo al cerrar %s después de la lectura: %s"
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "no se puede cerrar %s: %s"
@@ -4748,7 +4749,7 @@ msgstr ""
 "--package y --divert.\n"
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr "se han especificado dos órdenes: %s y --%s"
@@ -4772,13 +4773,13 @@ msgid "package may not contain newlines"
 msgstr "el nombre de paquete no puede tener saltos de línea"
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s necesita un directorio como parámetro"
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "opción `%s' desconocida"
@@ -4878,12 +4879,12 @@ msgstr "no se puede efectuar `stat' sobre el nombre antiguo `%s': %s"
 msgid "cannot stat new name `%s': %s"
 msgstr "no se puede efectuar `stat' sobre el nombre nuevo `%s': %s"
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "error al comprobar `%s': %s"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4892,47 +4893,47 @@ msgstr ""
 "renombrar obliga a sobreescribir `%s' con\n"
 "  un fichero distinto `%s', no está permitido."
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "rename: eliminado enlace antiguo duplicado `%s': %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "rename: se renombró `%s' a `%s': %s"
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "creado diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "escribiendo diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "cerrando diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "eliminar diversions-old antiguo: %s"
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "«diversions-old» nuevo creado: %s"
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "instalados nuevos desvíos: %s"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "error interno: %s dañado: %s"
@@ -5486,54 +5487,88 @@ msgstr "No hay ninguna versi
 msgid "Current `best' version is %s."
 msgstr "Actualmente la «mejor» versión es %s."
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
+#, fuzzy, perl-format
+msgid ""
+"warning: %s is supposed to be a symlink to %s, \n"
+"or nonexistent; however, readlink failed: %s"
+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:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr "Dejando %s (%s) para que apunte a %s."
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
+msgstr "Actualizando %s (%s) para que apunte a %s."
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr "Se utiliza `%s' para proveer `%s'."
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr "Eliminando %s (%s), no es apropiado para %s."
+
+#: scripts/update-alternatives.pl:288
+#, perl-format
+msgid "unable to remove %s: %s"
+msgstr "no se puede eliminar %s: %s"
+
+#: scripts/update-alternatives.pl:301
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "argumento `%s' desconocido"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install necesita <enlace> <nombre> <ruta> <prioridad>"
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr "el valor de prioridad debe ser un entero"
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s necesita <nombre> <ruta>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s necesita <nombre>"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave necesita <enlace> <nombre> <ruta>"
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "el nombre esclavo %s está duplicado"
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "el enlace esclavo %s está duplicado"
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, 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:293
+#: scripts/update-alternatives.pl:351
 #, 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:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5541,31 +5576,21 @@ msgstr ""
 "necesito --display, --config, --set, --install, --remove, --all, --remove-"
 "all o --auto"
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr "sólo se puede utilizar --slave con --install"
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "No hay alternativas para %s."
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Configurando la selección automática de %s."
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, perl-format
-msgid "unable to remove %s: %s"
-msgstr "no se puede eliminar %s: %s"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5574,7 +5599,7 @@ msgstr ""
 "Se ha cambiado %s (manualmente o por un programa).\n"
 "Cambiando para realizar sólo actualizaciones manuales."
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5584,127 +5609,71 @@ msgstr ""
 "s ...\n"
 "(Puede modificar los enlaces allí si lo desea - consulte «man ln».)"
 
-#: scripts/update-alternatives.pl:392
+#: scripts/update-alternatives.pl:448
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Renombrando el enlace %s de %s a %s."
 
-#: scripts/update-alternatives.pl:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "no se puede renombrar %s a %s: %s"
 
-#: scripts/update-alternatives.pl:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "el nombre del enlace esclavo %s está duplicado"
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, 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:433
+#: scripts/update-alternatives.pl:489
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 "Eliminando la alternativa seleccionada manualmente, cambiando a modo "
 "automático"
 
-#: scripts/update-alternatives.pl:447
+#: scripts/update-alternatives.pl:503
 #, 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:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Descartando el enlace esclavo obsoleto %s (%s)."
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, 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:497
+#: scripts/update-alternatives.pl:551
 #, 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:501
+#: scripts/update-alternatives.pl:555
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Restaurando de una actualización previa fallida de %s ..."
 
-#: scripts/update-alternatives.pl:516
+#: scripts/update-alternatives.pl:569
 #, 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:539
+#: scripts/update-alternatives.pl:592
 #, 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:553
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a symlink to %s\n"
-" (or nonexistent); however, readlink failed: %s"
-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:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr "no es posible asegurar que %s no exista: %s"
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, 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:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, perl-format
-msgid "unable to install %s as %s: %s"
-msgstr "no se puede instalar %s como %s: %s"
-
-#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr "Dejando %s (%s) para que apunte a %s."
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr "Actualizando %s (%s) para que apunte a %s."
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr "Eliminando %s (%s), no es apropiado para %s."
-
-#: scripts/update-alternatives.pl:600
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a slave symlink to\n"
-" %s, or nonexistent; however, readlink failed: %s"
-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:634
+#: scripts/update-alternatives.pl:631
 #, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5713,7 +5682,7 @@ msgstr ""
 "No hay un programa que provea %s\n"
 "No hay nada que configurar.\n"
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5722,7 +5691,7 @@ msgstr ""
 "Sólo hay un programa que provee %s\n"
 "(%s). No se configurará nada.\n"
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5735,49 +5704,64 @@ msgstr ""
 "  Selección     Alternativa\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 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:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr "Se utiliza `%s' para proveer `%s'."
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "No se encuentra una alternativa `%s'."
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "error al escribir a salida estándar: %s"
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, 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:735
+#: scripts/update-alternatives.pl:696
 #, 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:736
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "missing newline after %s"
 msgstr "falta una nueva línea después de %s"
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, 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:715
+#, perl-format
+msgid "unable to install %s as %s: %s"
+msgstr "no se puede instalar %s como %s: %s"
+
+#: scripts/update-alternatives.pl:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Problema grave: %s"
 
+#~ msgid "unable to ensure %s nonexistent: %s"
+#~ msgstr "no es posible asegurar que %s no exista: %s"
+
+#~ msgid ""
+#~ "warning: %s is supposed to be a slave symlink to\n"
+#~ " %s, or nonexistent; however, readlink failed: %s"
+#~ msgstr ""
+#~ "aviso: se supone que %s es un enlace simbólico a\n"
+#~ " %s, o no existe; pero «readlink» ha fallado: %s"
+
 #~ msgid "warning"
 #~ msgstr "atención"
 
diff --git a/po/et.po b/po/et.po
index 9e3d9de3..9ba91768 100644
--- a/po/et.po
+++ b/po/et.po
@@ -1,6 +1,6 @@
 # dpkg eesti keele tõlge.
 # Estonian translation of dpkg.
-# 
+#
 # This file is distributed under the same license as the dpkg package.
 #
 # Copyright (C) 2006, 2007 Free Software Foundation, Inc.
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14.5\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\n"
 "PO-Revision-Date: 2007-07-12 22:06+0300\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -4188,7 +4188,7 @@ msgid "unable to close %s after read: %s"
 msgstr "faili %s pole võimalik peale lugemist sulgeda: %s"
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "faili %s pole võimalik sulgeda: %s"
@@ -4254,7 +4254,7 @@ msgid ""
 msgstr ""
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr "korraga on määratud kaks käsku: %s ja --%s"
@@ -4278,13 +4278,13 @@ msgid "package may not contain newlines"
 msgstr "pakk ei tohi sisaldada reavahetusi"
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s vajab argumenti <kataloog>"
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "tundmatu võti `%s'"
@@ -4377,59 +4377,59 @@ msgstr ""
 msgid "cannot stat new name `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "viga `%s' kontrollimisel: %s"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
 "  different file `%s', not allowed"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "ümbernimetamine: korduva vana viida `%s' eemaldamine: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "ümbernimetamine: `%s' ümbernimetamine nimega `%s': %s"
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "uute diversioonide paigaldamine: %s"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "sisemine viga: %s on rikutud: %s"
@@ -4879,54 +4879,86 @@ msgstr "Versioone pole saadaval."
 msgid "Current `best' version is %s."
 msgstr "Käesolevaga on `parim' versioon %s."
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
+#, 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:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr "%s (%s) jäetakse viitama failile %s."
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
+msgstr "Viita %s (%s) uuendatakse viitamaks failile %s."
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr "`%s' kasutamine `%s' tagamiseks."
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr "%s (%s) eemaldamine, pole failiga %s sobilik."
+
+#: scripts/update-alternatives.pl:288
+#, perl-format
+msgid "unable to remove %s: %s"
+msgstr "faili %s pole võimalik eemaldada: %s"
+
+#: scripts/update-alternatives.pl:301
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "tundmatu argument `%s'"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr "tähtsus peab olema määratud täisarvuga"
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s vajab argumente <nimi> <rada>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s vajab argumenti <nimi>"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave vajab argumente <viit> <nimi> <rada>"
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:293
+#: scripts/update-alternatives.pl:351
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -4934,38 +4966,28 @@ msgstr ""
 "vaja on võtit --display, --config, --set, --install, --remove, --all, --"
 "remove-all või --auto"
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr "--slave on lubatud ainult koos võtmega --install"
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "%s jaoks pole alternatiive."
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Automaatse valiku seadmine %s jaoks."
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, perl-format
-msgid "unable to remove %s: %s"
-msgstr "faili %s pole võimalik eemaldada: %s"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
 "Switching to manual updates only."
 msgstr ""
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -4975,121 +4997,69 @@ msgstr ""
 "uuendamine...\n"
 "(Soovi korral võid seak olevaid nimeviitasid ise muuta - vaata `man ln'.)"
 
-#: scripts/update-alternatives.pl:392
+#: scripts/update-alternatives.pl:448
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Viida %s ümbernimetamine nimest %s nimega %s."
 
-#: scripts/update-alternatives.pl:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "%s pole võimalik nimega %s ümber nimetada: %s"
 
-#: scripts/update-alternatives.pl:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:489
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 "Käsitsi valitud alternatiivi eemaldamine - lülitumine automaatrežiimile"
 
-#: scripts/update-alternatives.pl:447
+#: scripts/update-alternatives.pl:503
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "Alternatiivi %s pole %s jaoks registreeritud, ei eemalda."
 
-#: scripts/update-alternatives.pl:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr ""
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, 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:497
+#: scripts/update-alternatives.pl:551
 #, 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:501
+#: scripts/update-alternatives.pl:555
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr ""
 
-#: scripts/update-alternatives.pl:516
+#: scripts/update-alternatives.pl:569
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "faili %s pole võimalik kirjutamiseks avada: %s"
 
-#: scripts/update-alternatives.pl:539
+#: scripts/update-alternatives.pl:592
 #, 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:553
-#, 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:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr ""
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, perl-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "nimeviita %s pole võimalik %s peale viitama panna: %s"
-
-#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, perl-format
-msgid "unable to install %s as %s: %s"
-msgstr "faili %s pole võimalik asukohale %s paigaldada: %s"
-
-#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr "%s (%s) jäetakse viitama failile %s."
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr "Viita %s (%s) uuendatakse viitamaks failile %s."
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr "%s (%s) eemaldamine, pole failiga %s sobilik."
-
-#: scripts/update-alternatives.pl:600
-#, 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:634
+#: scripts/update-alternatives.pl:631
 #, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5098,7 +5068,7 @@ msgstr ""
 "Süsteemis pole ühtegi programmi, mis tagaks %s.\n"
 "Pole midagi seadistada.\n"
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5107,7 +5077,7 @@ msgstr ""
 "Süsteemis on ainult 1 programm, mis tagab %s\n"
 "(%s). Pole midagi seadistada.\n"
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5120,43 +5090,48 @@ msgstr ""
 "      Valik    Alternatiiv\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 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:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr "`%s' kasutamine `%s' tagamiseks."
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Alternatiivi `%s' pole võimalik leida."
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "viga standardväljundisse kirjutamisel: %s"
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:696
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:736
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "missing newline after %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, perl-format
+msgid "unable to make %s a symlink to %s: %s"
+msgstr "nimeviita %s pole võimalik %s peale viitama panna: %s"
+
+#: scripts/update-alternatives.pl:715
+#, perl-format
+msgid "unable to install %s as %s: %s"
+msgstr "faili %s pole võimalik asukohale %s paigaldada: %s"
+
+#: scripts/update-alternatives.pl:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Tõsine probleem: %s"
diff --git a/po/eu.po b/po/eu.po
index 3ba13742..204c7053 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-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\n"
 "PO-Revision-Date: 2007-09-04 23:25+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Euskara <Librezale@librezale.org>\n"
@@ -4522,7 +4522,7 @@ msgid "unable to close %s after read: %s"
 msgstr "ezin da irakurri ondoren %s itxi: %s"
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "Ezin da %s itxi: %s"
@@ -4613,7 +4613,7 @@ msgstr ""
 "divert.\n"
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr "bi komando ezarri dira: %s eta --%s"
@@ -4637,13 +4637,13 @@ msgid "package may not contain newlines"
 msgstr "paketea ezin du lerro berririk eduki"
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s-(e)k <direktorio> argumentu bat behar du"
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "`%s' aukera ezezaguna"
@@ -4742,12 +4742,12 @@ msgstr "ezin da`%s' izen zaharra atzitu: %s"
 msgid "cannot stat new name `%s': %s"
 msgstr "ezin da `%s' izen berria atzitu: %s"
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "errorea `%s' egiaztatzean: %s"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4756,47 +4756,47 @@ msgstr ""
 "berrizendatzeak `%s' gainidaztea dakar\n"
 "  `%s' fitxategi ezberdinarekin, ez da onartzen"
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "rename: `%s' lotura zaharra ezabatu: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "rename: `%s' `%s'-ra berrizendatu: %s"
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "diversions-new sortu: %s"
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "diversions-new idatzi: %s"
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "diversions-new itxi: %s"
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "diversions-old zaharra ezabatu: %s"
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "diversions-old berria sortu: %s"
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "desbideraketa berriak instalatu: %s"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "barne errorea: %s hondaturik: %s"
@@ -5325,54 +5325,88 @@ msgstr "ez dago bertsiorik eskuragarri."
 msgid "Current `best' version is %s."
 msgstr "Unekobertsio `onena' %s da."
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
+#, fuzzy, perl-format
+msgid ""
+"warning: %s is supposed to be a symlink to %s, \n"
+"or nonexistent; however, readlink failed: %s"
+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:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr "%s (%s)-ra lotzen %s utzi."
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
+msgstr "%s (%s) egunaratzen %s-ra jo dezan"
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr "`%s' erabiltzen `%s'-etaz hornitzeko."
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr "%s (%s) ezabatzen, ez da %s-rekin egokia."
+
+#: scripts/update-alternatives.pl:288
+#, perl-format
+msgid "unable to remove %s: %s"
+msgstr "ezin da %s ezabatu: %s"
+
+#: scripts/update-alternatives.pl:301
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "`%s' argumentu ezezaguna"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install-ek <lotura> <izena> <bidea> <lehentasuna> behar ditu"
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr "lehentasuna zenbaki oso bat izan behar da"
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s-ek <izena> <bidea> behar ditu"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s-ek <izena> behar du"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave-ek <lotura> <izena> <bidea> behar ditu"
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "%s izen morroia bikoizturik"
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "%s lotura morroia bikoizturik dago"
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "%s izena batera morroi eta nagusia da"
 
-#: scripts/update-alternatives.pl:293
+#: scripts/update-alternatives.pl:351
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "%s lotura batera morroi eta nagusia da"
 
-#: scripts/update-alternatives.pl:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5380,31 +5414,21 @@ msgstr ""
 "--display, --config, --set, --install, --remove, --all, --remove-all edo --"
 "auto behar da"
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr "--slave --install-ekin batera bakarrik onartzen da"
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Ez dago alternatibarik %s-rentzat."
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "%s-ren hautatze automatikoa ezartzen."
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, perl-format
-msgid "unable to remove %s: %s"
-msgstr "ezin da %s ezabatu: %s"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5413,7 +5437,7 @@ msgstr ""
 "%s aldatu egin da (eskuz edo script batez).\n"
 "Eskuzko eguneraketara aldatzen."
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5423,124 +5447,68 @@ msgstr ""
 "(lotura sinbolikoa aldatu beharko duzu zure kabuz, laguntza behar ezkero "
 "`man ln' begiratu.)"
 
-#: scripts/update-alternatives.pl:392
+#: scripts/update-alternatives.pl:448
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "%s lotura %s-tik %s-ra berrizendatzen."
 
-#: scripts/update-alternatives.pl:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "ezin da %s %s-ra berrizendatu: %s"
 
-#: scripts/update-alternatives.pl:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "%s lotura morroi izena bikoizturik dago"
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "%s lotura morroia %s-tik %s-ra berrizendatzen."
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:489
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "Eskuz hautaturiko alternatiba ezabatzen - modu automatikora aldatzen"
 
-#: scripts/update-alternatives.pl:447
+#: scripts/update-alternatives.pl:503
 #, 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:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "%s (%s) lotura morroi zaharra alde batetara uzten."
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, 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:497
+#: scripts/update-alternatives.pl:551
 #, 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:501
+#: scripts/update-alternatives.pl:555
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Aurretik huts egindako  %s-ren eguneraketa batetik berreskuratzen"
 
-#: scripts/update-alternatives.pl:516
+#: scripts/update-alternatives.pl:569
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "Ezin da %s idazteko ireki: %s"
 
-#: scripts/update-alternatives.pl:539
+#: scripts/update-alternatives.pl:592
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "%s (%s) hornitzen duen azken paketea ezabaturik, ezabatzen."
 
-#: scripts/update-alternatives.pl:553
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a symlink to %s\n"
-" (or nonexistent); however, readlink failed: %s"
-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:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr "ezin da ziurtatu %s ez dagoenik: %s"
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, 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:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, perl-format
-msgid "unable to install %s as %s: %s"
-msgstr "Ezin da %s %s bezala instalatu: %s"
-
-#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr "%s (%s)-ra lotzen %s utzi."
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr "%s (%s) egunaratzen %s-ra jo dezan"
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr "%s (%s) ezabatzen, ez da %s-rekin egokia."
-
-#: scripts/update-alternatives.pl:600
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a slave symlink to\n"
-" %s, or nonexistent; however, readlink failed: %s"
-msgstr ""
-"abisua: %s, %s-ra esteka sinboliko morroia dela pentsatzen da,\n"
-"edo ez dago, hala ere, lotura irakurtzeak huts egin du: %s"
-
-#: scripts/update-alternatives.pl:634
+#: scripts/update-alternatives.pl:631
 #, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5549,7 +5517,7 @@ msgstr ""
 "Ez dago %s hornitzen duen programarik.\n"
 "Ezer ez konfiguratzeko.\n"
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5558,7 +5526,7 @@ msgstr ""
 "Programa 1 bakarrik dago %s (%s)-taz hornitzen\n"
 " duena. Ezer konfiguratzeko.\n"
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5571,42 +5539,57 @@ msgstr ""
 "Alternatiba aukeratu\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 "Enter sakatu lehenespena mantentzeko[*], edo hautatze zenbakia sakatu: "
 
-#: scripts/update-alternatives.pl:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr "`%s' erabiltzen `%s'-etaz hornitzeko."
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Ezin da `%s' ordezkorik aurkitu."
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "errorea irteera estandarrean idazterakoan: %s"
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "update-alternatives fitxategiak (%s) ezin du lerro berririk eduki"
 
-#: scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:696
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "fitxategi amaiera edo errorea %s irakurtzean %s-rako (%s)"
 
-#: scripts/update-alternatives.pl:736
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "missing newline after %s"
 msgstr "lerro berria falta da %s ondoren"
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, 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:715
+#, perl-format
+msgid "unable to install %s as %s: %s"
+msgstr "Ezin da %s %s bezala instalatu: %s"
+
+#: scripts/update-alternatives.pl:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Arazo larria: %s"
+
+#~ msgid "unable to ensure %s nonexistent: %s"
+#~ msgstr "ezin da ziurtatu %s ez dagoenik: %s"
+
+#~ msgid ""
+#~ "warning: %s is supposed to be a slave symlink to\n"
+#~ " %s, or nonexistent; however, readlink failed: %s"
+#~ msgstr ""
+#~ "abisua: %s, %s-ra esteka sinboliko morroia dela pentsatzen da,\n"
+#~ "edo ez dago, hala ere, lotura irakurtzeak huts egin du: %s"
diff --git a/po/fr.po b/po/fr.po
index 339528b8..568c5246 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -23,7 +23,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\n"
 "PO-Revision-Date: 2007-10-03 18:09+0200\n"
 "Last-Translator: Frederic Bothamy <frederic.bothamy@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -174,8 +174,7 @@ msgstr "%s : compression"
 #: lib/database.c:124
 #, c-format
 msgid "couldn't allocate memory for strdup in findpackage(%s)"
-msgstr ""
-"impossible d'allouer de la mémoire pour « strdup » dans findpackage(%s)"
+msgstr "impossible d'allouer de la mémoire pour « strdup » dans findpackage(%s)"
 
 #: lib/database.c:194
 #, c-format
@@ -192,8 +191,8 @@ msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
 "max=%d)"
 msgstr ""
-"le répertoire des mises à jour contient un fichier « %.250s » dont le nom "
-"est trop long (longueur=%d, max=%d)"
+"le répertoire des mises à jour contient un fichier « %.250s » dont le nom est "
+"trop long (longueur=%d, max=%d)"
 
 #: lib/dbmodify.c:63
 #, c-format
@@ -319,8 +318,7 @@ msgstr "la synchronisation de %s informations dans « %.250s » a échoué"
 #: lib/dump.c:319
 #, c-format
 msgid "failed to close `%.250s' after writing %s information"
-msgstr ""
-"la fermeture de « %.250s » après l'écriture de %s informations a échoué"
+msgstr "la fermeture de « %.250s » après l'écriture de %s informations a échoué"
 
 #: lib/dump.c:323
 #, c-format
@@ -545,8 +543,7 @@ msgstr "champ « %s », référence à « %.255s » : erreur dans la versio
 #: lib/fields.c:439
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
-msgstr ""
-"champ « %s », erreur de syntaxe après la référence au paquet « %.255s »"
+msgstr "champ « %s », erreur de syntaxe après la référence au paquet « %.255s »"
 
 #: lib/fields.c:447
 #, c-format
@@ -825,14 +822,13 @@ msgstr ""
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr ""
-"caractère EOF de MS-DOS dans la valeur du champ « %.*s » (manque-t-il un "
-"saut de ligne ?)"
+"caractère EOF de MS-DOS dans la valeur du champ « %.*s » (manque-t-il un saut "
+"de ligne ?)"
 
 #: lib/parse.c:188
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
-msgstr ""
-"EOF dans la valeur du champ « %.*s » (il manque le saut de ligne final)"
+msgstr "EOF dans la valeur du champ « %.*s » (il manque le saut de ligne final)"
 
 #: lib/parse.c:211
 #, c-format
@@ -1056,15 +1052,14 @@ msgstr "Remplacés par des fichiers du paquet %s déjà installé...\n"
 msgid ""
 "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
 msgstr ""
-"tentative de remplacement du répertoire « %.250s » dans le paquet %.250s "
-"avec un élément de type différent"
+"tentative de remplacement du répertoire « %.250s » dans le paquet %.250s avec "
+"un élément de type différent"
 
 #: src/archives.c:568
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr ""
-"tentative de remplacement de « %.250s », qui appartient aussi au paquet "
-"%.250s"
+"tentative de remplacement de « %.250s », qui appartient aussi au paquet %.250s"
 
 #: src/archives.c:593
 #, c-format
@@ -1366,8 +1361,7 @@ msgstr "impossible de réinstaller la copie de secours de « %.250s »"
 #: src/cleanup.c:94
 #, c-format
 msgid "unable to remove newly-installed version of `%.250s'"
-msgstr ""
-"impossible de supprimer la version nouvellement installée de « %.250s »"
+msgstr "impossible de supprimer la version nouvellement installée de « %.250s »"
 
 #: src/cleanup.c:101
 #, c-format
@@ -1488,8 +1482,8 @@ msgstr ""
 #, c-format
 msgid "dpkg: %s: warning - failed to link `%.250s' to `%.250s': %s\n"
 msgstr ""
-"dpkg : %s : avertissement - échec de la liaison de « %.250s » à « %.250s » : "
-"%s\n"
+"dpkg : %s : avertissement - échec de la liaison de « %.250s » à « %.250s » : %"
+"s\n"
 
 #: src/configure.c:271
 #, c-format
@@ -1570,8 +1564,8 @@ msgstr ""
 #, c-format
 msgid "unable to set mode of new dist conffile `%.250s'"
 msgstr ""
-"impossible de changer les permissions du conffile : « %.250s » de la "
-"nouvelle distribution"
+"impossible de changer les permissions du conffile : « %.250s » de la nouvelle "
+"distribution"
 
 #: src/configure.c:466
 #, c-format
@@ -2356,8 +2350,7 @@ msgstr ""
 "Ce programme est un logiciel libre ; prière de consulter la « GNU General\n"
 "Public  License » version 2 ou supérieure pour prendre connaissance des\n"
 "conditions de reproduction. AUCUNE garantie n'est offerte.\n"
-"Voir « %s --license » pour les détails de licence et droits de "
-"reproduction.\n"
+"Voir « %s --license » pour les détails de licence et droits de reproduction.\n"
 
 #: src/main.c:57 src/query.c:501 dpkg-deb/main.c:56 dpkg-split/main.c:49
 #, c-format
@@ -2662,8 +2655,7 @@ msgstr ""
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
-"--ignore-depends requiert un nom de paquet légal. « %.250s » ne l'est pas ; %"
-"s"
+"--ignore-depends requiert un nom de paquet légal. « %.250s » ne l'est pas ; %s"
 
 #: src/main.c:288 src/main.c:299
 #, c-format
@@ -3057,8 +3049,7 @@ msgstr "archive du système de fichiers corrompue - archive du paquet corrompue"
 
 #: src/processarc.c:578
 msgid "dpkg-deb: zap possible trailing zeros"
-msgstr ""
-"dpkg-deb : suppression de possibles zéros finaux (i.e. de « trailing »)"
+msgstr "dpkg-deb : suppression de possibles zéros finaux (i.e. de « trailing »)"
 
 #: src/processarc.c:631
 #, c-format
@@ -3144,8 +3135,8 @@ msgstr "l'information de contrôle du paquet contient le répertoire « %.250s
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr ""
-"l'information de contrôle du paquet « rmdir » de « %.250s » ne dit pas que "
-"ce n'est pas un répertoire"
+"l'information de contrôle du paquet « rmdir » de « %.250s » ne dit pas que ce "
+"n'est pas un répertoire"
 
 #: src/processarc.c:808
 #, c-format
@@ -3661,8 +3652,8 @@ msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
 "<=0775)"
 msgstr ""
-"le script « %.50s » du responsable n'a pas les bonnes permissions %03lo "
-"(doit être >=0755 et <=0775)"
+"le script « %.50s » du responsable n'a pas les bonnes permissions %03lo (doit "
+"être >=0755 et <=0775)"
 
 #: dpkg-deb/build.c:291
 #, c-format
@@ -3678,8 +3669,8 @@ msgstr "« fgets » renvoie une chaîne vide en lisant les conffiles"
 msgid ""
 "warning, conffile name `%.50s...' is too long, or missing final newline\n"
 msgstr ""
-"avertissement, le nom du conffile « %.50s... » est trop long, ou il manque "
-"le saut de ligne final\n"
+"avertissement, le nom du conffile « %.50s... » est trop long, ou il manque le "
+"saut de ligne final\n"
 
 #: dpkg-deb/build.c:316
 #, c-format
@@ -3851,8 +3842,7 @@ msgstr ""
 #: dpkg-deb/extract.c:122
 #, c-format
 msgid "file `%.250s' is corrupt - negative member length %zi"
-msgstr ""
-"le fichier « %.250s » est corrompu - longueur négative de l'élément %zi"
+msgstr "le fichier « %.250s » est corrompu - longueur négative de l'élément %zi"
 
 #: dpkg-deb/extract.c:126
 #, c-format
@@ -4295,15 +4285,15 @@ msgstr "le fichier « %.250s » est corrompu - mauvais nombre de parties"
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr ""
-"le fichier « %.250s » est corrompu - mauvais « magic » à la fin de la "
-"section d'en-tête"
+"le fichier « %.250s » est corrompu - mauvais « magic » à la fin de la section "
+"d'en-tête"
 
 #: dpkg-split/info.c:147
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
 msgstr ""
-"le fichier « %.250s » est corrompu - le deuxième élément n'est pas un "
-"élément de données"
+"le fichier « %.250s » est corrompu - le deuxième élément n'est pas un élément "
+"de données"
 
 #: dpkg-split/info.c:153
 #, c-format
@@ -4726,7 +4716,7 @@ msgid "unable to close %s after read: %s"
 msgstr "impossible de fermer %s après lecture : %s"
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "impossible de fermer %s : %s"
@@ -4822,7 +4812,7 @@ msgstr ""
 "--package et --divert.\n"
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr "deux commandes spécifiées : %s et --%s"
@@ -4846,13 +4836,13 @@ msgid "package may not contain newlines"
 msgstr "le paquet ne peut pas contenir de retour chariot"
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s a besoin d'un paramètre <répertoire>"
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "option « %s » inconnue"
@@ -4951,12 +4941,12 @@ msgstr "analyse impossible sur l'ancien nom « %s » : %s"
 msgid "cannot stat new name `%s': %s"
 msgstr "analyse impossible sur le nouveau nom « %s » : %s"
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "erreur lors de la vérification de « %s » : %s"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4965,47 +4955,47 @@ msgstr ""
 "le renommage implique l'écrasement de « %s » avec\n"
 "  un fichier différent « %s », ce n'est pas autorisé"
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "renommage : suppression de l'ancien lien dupliqué « %s » : %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "renommage : renommage de « %s » en « %s » : %s"
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "création de diversions-new : %s"
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "écriture de diversions-new : %s"
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "fermeture de diversions-new : %s"
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "suppression de l'ancien diversions-old : %s"
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "écriture du nouveau diversions-old : %s"
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "installation des nouvelles diversions : %s"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "erreur interne : %s corrompu : %s"
@@ -5276,8 +5266,7 @@ msgid ""
 msgstr ""
 "\n"
 "Pas de « START-INFO-DIR-ENTRY » et pas de « This file documents ».\n"
-"%s : impossible de déterminer la description pour l'entrée « dir » - "
-"abandon\n"
+"%s : impossible de déterminer la description pour l'entrée « dir » - abandon\n"
 
 #: scripts/install-info.pl:275
 #, perl-format
@@ -5555,54 +5544,88 @@ msgstr "Aucune version disponible."
 msgid "Current `best' version is %s."
 msgstr "La « meilleure » version actuelle est %s."
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
+#, fuzzy, perl-format
+msgid ""
+"warning: %s is supposed to be a symlink to %s, \n"
+"or nonexistent; however, readlink failed: %s"
+msgstr ""
+"Avertissement : %s est censé être un lien symbolique vers %s\n"
+" (ou non existant) ; cependant, échec de readlink : %s"
+
+#: scripts/update-alternatives.pl:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr "Conservation de %s (%s) pointant sur %s."
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
+msgstr "Mise à jour de %s (%s) pointant sur %s."
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr "Utilisation de « %s » pour fournir « %s »."
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr "Suppression de %s (%s), non approprié avec %s."
+
+#: scripts/update-alternatives.pl:288
+#, perl-format
+msgid "unable to remove %s: %s"
+msgstr "impossible de supprimer %s : %s"
+
+#: scripts/update-alternatives.pl:301
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "paramètre inconnu « %s »"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install a besoin de <lien> <nom> <chemin> <priorité>"
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr "la priorité doit être un entier"
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s a besoin de <nom> <chemin>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s a besoin de <nom>"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave a besoin de <lien> <nom> <chemin>"
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "le nom secondaire (« slave ») %s est dupliqué"
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "le lien secondaire (« slave ») %s est dupliqué"
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "le nom %s est à la fois principal et secondaire"
 
-#: scripts/update-alternatives.pl:293
+#: scripts/update-alternatives.pl:351
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "le lien %s est à la fois principal et secondaire"
 
-#: scripts/update-alternatives.pl:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5610,31 +5633,21 @@ msgstr ""
 "a besoin de --display, --config, --set, --install, --remove, --all, --remove-"
 "all ou --auto"
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr "--slave n'est autorisé qu'avec --install"
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Pas d'alternatives pour %s."
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Configuration de la sélection automatique pour %s."
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, perl-format
-msgid "unable to remove %s: %s"
-msgstr "impossible de supprimer %s : %s"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5643,7 +5656,7 @@ msgstr ""
 "%s a été changé (manuellement ou par un script).\n"
 "Bascule vers des mises à jour manuelles uniquement."
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5655,126 +5668,70 @@ msgstr ""
 "-\n"
 "voir « man ln »)."
 
-#: scripts/update-alternatives.pl:392
+#: scripts/update-alternatives.pl:448
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Renommage du lien %s de %s en %s."
 
-#: scripts/update-alternatives.pl:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "impossible de renommer %s en %s : %s"
 
-#: scripts/update-alternatives.pl:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "nom de lien secondaire %s dupliqué"
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, 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:433
+#: scripts/update-alternatives.pl:489
 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:447
+#: scripts/update-alternatives.pl:503
 #, 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:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Abandon du lien secondaire obsolète %s (%s)."
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, 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:497
+#: scripts/update-alternatives.pl:551
 #, 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:501
+#: scripts/update-alternatives.pl:555
 #, 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:516
+#: scripts/update-alternatives.pl:569
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "impossible d'ouvrir %s en écriture : %s"
 
-#: scripts/update-alternatives.pl:539
+#: scripts/update-alternatives.pl:592
 #, 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:553
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a symlink to %s\n"
-" (or nonexistent); however, readlink failed: %s"
-msgstr ""
-"Avertissement : %s est censé être un lien symbolique vers %s\n"
-" (ou non existant) ; cependant, échec de readlink : %s"
-
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr "impossible de garantir l'inexistence de %s : %s"
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, 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:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, perl-format
-msgid "unable to install %s as %s: %s"
-msgstr "impossible d'installer %s en tant que %s : %s"
-
-#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr "Conservation de %s (%s) pointant sur %s."
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr "Mise à jour de %s (%s) pointant sur %s."
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr "Suppression de %s (%s), non approprié avec %s."
-
-#: scripts/update-alternatives.pl:600
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a slave symlink to\n"
-" %s, or nonexistent; however, readlink failed: %s"
-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:634
+#: scripts/update-alternatives.pl:631
 #, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5783,7 +5740,7 @@ msgstr ""
 "Il n'y a aucun programme fournissant %s.\n"
 "Rien à configurer.\n"
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5792,7 +5749,7 @@ msgstr ""
 "Il n'y a qu'un programme fournissant %s (%s).\n"
 "Rien à configurer.\n"
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5805,48 +5762,63 @@ msgstr ""
 "  Sélection    Alternative\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 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:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr "Utilisation de « %s » pour fournir « %s »."
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Impossible de trouver l'alternative « %s »."
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "erreur d'écriture sur la sortie standard : %s"
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, 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:735
+#: scripts/update-alternatives.pl:696
 #, 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:736
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "missing newline after %s"
 msgstr "retour chariot absent après %s"
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, 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:715
+#, perl-format
+msgid "unable to install %s as %s: %s"
+msgstr "impossible d'installer %s en tant que %s : %s"
+
+#: scripts/update-alternatives.pl:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Problème grave : %s"
 
+#~ msgid "unable to ensure %s nonexistent: %s"
+#~ msgstr "impossible de garantir l'inexistence de %s : %s"
+
+#~ msgid ""
+#~ "warning: %s is supposed to be a slave symlink to\n"
+#~ " %s, or nonexistent; however, readlink failed: %s"
+#~ msgstr ""
+#~ "avertissement : %s est censé être un lien symbolique secondaire vers\n"
+#~ "%s ou ne pas exister ; cependant, échec de readlink : %s"
+
 #~ msgid "warning"
 #~ msgstr "avertissement"
 
diff --git a/po/gl.po b/po/gl.po
index 38cb2a43..d40a5caa 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-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\n"
 "PO-Revision-Date: 2007-10-14 14:29+0100\n"
 "Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -4561,7 +4561,7 @@ msgid "unable to close %s after read: %s"
 msgstr "non se pode pechar %s trala lectura: %s"
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "non se pode pechar %s: %s"
@@ -4651,7 +4651,7 @@ msgstr ""
 "Os scripts de preinst/postrm deberían especificar --package e --divert.\n"
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr "especificáronse dúas ordes: %s e --%s"
@@ -4675,13 +4675,13 @@ msgid "package may not contain newlines"
 msgstr "o nome do paquete non pode conter saltos de liña"
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s precisa dun argumento de directorio"
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "opción \"%s\" descoñecida"
@@ -4780,12 +4780,12 @@ msgstr "non se atopa o nome antigo \"%s\": %s"
 msgid "cannot stat new name `%s': %s"
 msgstr "non se atopa o novo nome \"%s\": %s"
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "erro ao comprobar \"%s\": %s"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4794,47 +4794,47 @@ msgstr ""
 "o cambio de nome supón sobrescribir \"%s\" co\n"
 "  ficheiro diferente \"%s\", non se permite"
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "rename: eliminación da ligazón antiga duplicada \"%s\": %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "rename: cambio do nome de \"%s\" a \"%s\": %s"
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "creación do ficheiro diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "escritura do ficheiro diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "peche do ficheiro diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "eliminación do antigo ficheiro diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "creación do novo ficheiro diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "instalación de novos desvíos: %s"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "erro interno: %s está corrompido: %s"
@@ -5367,54 +5367,88 @@ msgstr "Non hia ningunha versión dispoñible."
 msgid "Current `best' version is %s."
 msgstr "A versión \"mellor\" actual é %s."
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
+#, fuzzy, perl-format
+msgid ""
+"warning: %s is supposed to be a symlink to %s, \n"
+"or nonexistent; however, readlink failed: %s"
+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:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr "Déixase %s (%s) apuntando a %s."
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
+msgstr "A actualizar %s (%s) para que apunte a %s."
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr "A empregar \"%s\" para fornecer \"%s\"."
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr "A eliminar %s (%s); non é apropiado con %s."
+
+#: scripts/update-alternatives.pl:288
+#, perl-format
+msgid "unable to remove %s: %s"
+msgstr "non se pode eliminar %s: %s"
+
+#: scripts/update-alternatives.pl:301
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "argumento \"%s\" descoñecido"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install precisa dos argumentos de ligazón, nome, ruta e prioridade"
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr "a prioridade ten que ser un número enteiro"
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s precisa dos argumentos de nome e ruta"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s precisa do argumento de nome"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave precisa dos argumentos de ligazón, nome e ruta"
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "nome de escravo %s duplicado"
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "ligazón escrava %s duplicada"
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "o nome %s é primario e escravo ao mesmo tempo"
 
-#: scripts/update-alternatives.pl:293
+#: scripts/update-alternatives.pl:351
 #, 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:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5422,31 +5456,21 @@ msgstr ""
 "precísase de --display, --config, --set, --install, --remove, --all, --"
 "remove-all ou -auto"
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr "só se admite --slave con --install"
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Non hai alternativas para %s."
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "A establecer a selección automática de %s."
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, perl-format
-msgid "unable to remove %s: %s"
-msgstr "non se pode eliminar %s: %s"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5455,7 +5479,7 @@ msgstr ""
 "%s cambiou (manualmente ou mediante un script).\n"
 "Cámbiase a só actualizacións manuais."
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5465,126 +5489,70 @@ msgstr ""
 "s ...\n"
 "(Pode modificar as ligazóns vostede se o prefire - consulte \"man ln\")."
 
-#: scripts/update-alternatives.pl:392
+#: scripts/update-alternatives.pl:448
 #, 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:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, 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:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "nome de ligazón escrava %s duplicado"
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, 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:433
+#: scripts/update-alternatives.pl:489
 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:447
+#: scripts/update-alternatives.pl:503
 #, 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:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "A descargar a ligazón escrava obsoleta %s (%s)."
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, 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:497
+#: scripts/update-alternatives.pl:551
 #, 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:501
+#: scripts/update-alternatives.pl:555
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "A recuperarse dunha anterior actualización fallida de %s ..."
 
-#: scripts/update-alternatives.pl:516
+#: scripts/update-alternatives.pl:569
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "non se pode abrir %s para escritura: %s"
 
-#: scripts/update-alternatives.pl:539
+#: scripts/update-alternatives.pl:592
 #, 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:553
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a symlink to %s\n"
-" (or nonexistent); however, readlink failed: %s"
-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:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr "non se pode asegurar que %s non exista: %s"
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, 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:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, perl-format
-msgid "unable to install %s as %s: %s"
-msgstr "non se pode instalar %s coma %s: %s"
-
-#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr "Déixase %s (%s) apuntando a %s."
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr "A actualizar %s (%s) para que apunte a %s."
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr "A eliminar %s (%s); non é apropiado con %s."
-
-#: scripts/update-alternatives.pl:600
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a slave symlink to\n"
-" %s, or nonexistent; however, readlink failed: %s"
-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:634
+#: scripts/update-alternatives.pl:631
 #, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5593,7 +5561,7 @@ msgstr ""
 "Só hai ningún programa que forneza %s.\n"
 "Non hai nada que configurar.\n"
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5602,7 +5570,7 @@ msgstr ""
 "Só hai un programa que forneza %s\n"
 "(%s). Non hai nada que configurar.\n"
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5615,48 +5583,63 @@ msgstr ""
 "  Selección    Alternativa\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 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:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr "A empregar \"%s\" para fornecer \"%s\"."
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Non se pode atopar a alternativa \"%s\"."
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "erro ao gravar na saída estándar: %s"
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, 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:735
+#: scripts/update-alternatives.pl:696
 #, 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:736
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "missing newline after %s"
 msgstr "falla un salto de liña despois de %s"
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, 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:715
+#, perl-format
+msgid "unable to install %s as %s: %s"
+msgstr "non se pode instalar %s coma %s: %s"
+
+#: scripts/update-alternatives.pl:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Problema grave: %s"
 
+#~ msgid "unable to ensure %s nonexistent: %s"
+#~ msgstr "non se pode asegurar que %s non exista: %s"
+
+#~ msgid ""
+#~ "warning: %s is supposed to be a slave symlink to\n"
+#~ " %s, or nonexistent; however, readlink failed: %s"
+#~ 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"
+
 #~ msgid "warning"
 #~ msgstr "aviso"
 
diff --git a/po/hu.po b/po/hu.po
index 84d21df8..7d0b6da7 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-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\n"
 "PO-Revision-Date: 2006-10-21 23:19+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: hu\n"
@@ -4423,7 +4423,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:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "nem tudom lezárni %s-t: %s"
@@ -4489,7 +4489,7 @@ msgid ""
 msgstr ""
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, fuzzy, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr "2 mód megadva: %s és --%s"
@@ -4513,13 +4513,13 @@ msgid "package may not contain newlines"
 msgstr "csomag nem tartalmazhat újsorokat"
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s egy <könyvtár> argumentumot vár"
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "ismeretlen `%s' lehetőség"
@@ -4618,12 +4618,12 @@ msgstr "a régi `%s' név nem található: %s"
 msgid "cannot stat new name `%s': %s"
 msgstr "az új `%s' név nem behatárolható: %s"
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "hiba `%s' ellenőrzésekor: %s"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4632,47 +4632,47 @@ msgstr ""
 "átnevezés `%s' felülírásával járna\n"
 "  `%s' eltérő fájllal, ez nem engedélyezett"
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "átnevezés: kettős régi `%s' lánc törlése: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "átnevezés: `%s' átnevezése erre: `%s': %s"
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "diversions-new létrehozása: %s"
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "diversions-new írása: %s"
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "diversions-new lezárása: %s"
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "régi diversions-old eltávoltása: %s"
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "új diversions-old létrehozása: %s"
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "új eltérítések telepítése: %s"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "belső hiba: %s rossz: %s"
@@ -5163,54 +5163,86 @@ msgstr "Nincs elérhető verzió."
 msgid "Current `best' version is %s."
 msgstr "A jelenlegi `legjobb' verzió: %s"
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
+#, 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:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr "Meghagyom %s (%s)-t ezen: %s"
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
+msgstr "Frissítem %s (%s)-t erre: %s"
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr "`%s' használata `%s' számára."
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, 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:288
+#, perl-format
+msgid "unable to remove %s: %s"
+msgstr "nem tudom törölni %s-t: %s"
+
+#: scripts/update-alternatives.pl:301
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "ismeretlen %s argumentum"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 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:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr "az elsőbbség egész szám kell legyen"
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s számára <név> és <ösvény> kell"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s számára <név> kell"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr "a --slave követelményei: <lánc> <név> <ösvény>"
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "%s szolga név megkettőzött"
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "%s szolga lánc megkettőzött"
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "%s elsődleges és szolga név is"
 
-#: scripts/update-alternatives.pl:293
+#: scripts/update-alternatives.pl:351
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "%s elsődleges és szolga lánc is"
 
-#: scripts/update-alternatives.pl:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5218,31 +5250,21 @@ msgstr ""
 "igénye --display, --config, --set, --install, --remove, --all, --remove-all "
 "vagy --auto"
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr "a --slave csak --install mellett engedélyezett"
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Nincs kiválasztás erre: %s."
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "%s automata kijelölésének beállítása."
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, perl-format
-msgid "unable to remove %s: %s"
-msgstr "nem tudom törölni %s-t: %s"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5251,7 +5273,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:386
+#: scripts/update-alternatives.pl:442
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5260,120 +5282,68 @@ 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:392
+#: scripts/update-alternatives.pl:448
 #, 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:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "nem tudom átnevezni %s-t erre: %s: %s"
 
-#: scripts/update-alternatives.pl:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "%s szolga lánc név megkettőzött"
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, 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:433
+#: scripts/update-alternatives.pl:489
 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:447
+#: scripts/update-alternatives.pl:503
 #, 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:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Elavult %s szolga lánc átugrása (%s)."
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, 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:497
+#: scripts/update-alternatives.pl:551
 #, 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:501
+#: scripts/update-alternatives.pl:555
 #, 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:516
+#: scripts/update-alternatives.pl:569
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "nem tudom megnyitni %s-t írásra: %s"
 
-#: scripts/update-alternatives.pl:539
+#: scripts/update-alternatives.pl:592
 #, 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:553
-#, 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:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr "nem biztos, hogy %s nem létezik: %s"
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, 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:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, 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:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr "Meghagyom %s (%s)-t ezen: %s"
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr "Frissítem %s (%s)-t erre: %s"
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, 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:600
-#, 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:634
+#: scripts/update-alternatives.pl:631
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5382,7 +5352,7 @@ msgstr ""
 "Csak 1 program adja ezt: %s\n"
 "(%s). Nincs beállítandó.\n"
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5391,7 +5361,7 @@ msgstr ""
 "Csak 1 program adja ezt: %s\n"
 "(%s). Nincs beállítandó.\n"
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5404,45 +5374,53 @@ msgstr ""
 "  Kijelölés    Választás\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 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:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr "`%s' használata `%s' számára."
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Nem találom a `%s' kiválasztást"
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "hiba stdout íráskor: %s"
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "újsorok tilosak az update-alternatives fájlokban (%s)"
 
-#: scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:696
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "eof hiba %s olvasásakor ehhez: %s (%s)"
 
-#: scripts/update-alternatives.pl:736
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "missing newline after %s"
 msgstr "hiányzó új sor ezután: %s"
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, 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:715
+#, 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:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Komoly gond: %s"
 
+#~ msgid "unable to ensure %s nonexistent: %s"
+#~ msgstr "nem biztos, hogy %s nem létezik: %s"
+
 #~ msgid "warning"
 #~ msgstr "figyelj!"
 
diff --git a/po/id.po b/po/id.po
index e947fc15..40d42b30 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-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\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."
@@ -4351,7 +4351,7 @@ msgid "unable to close %s after read: %s"
 msgstr "gagal menutup setelah membaca: `%.255s'"
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, fuzzy, perl-format
 msgid "unable to close %s: %s"
 msgstr "tidak bisa menjalankan perintah %s"
@@ -4414,7 +4414,7 @@ msgid ""
 msgstr ""
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr ""
@@ -4439,13 +4439,13 @@ msgid "package may not contain newlines"
 msgstr "Paket `%s' tidak berisi suatu berkas pun!\n"
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, fuzzy, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--build butuh sebuah argumen direktori"
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, fuzzy, perl-format
 msgid "unknown option `%s'"
 msgstr "pilihan --%s tak dikenal"
@@ -4541,60 +4541,60 @@ msgstr "tidak dapat melakukan 'stat' pada `%.255s' (dalam `%.255s')"
 msgid "cannot stat new name `%s': %s"
 msgstr "tidak dapat melakukan 'stat' pada `%.255s' (dalam `%.255s')"
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, fuzzy, perl-format
 msgid "error checking `%s': %s"
 msgstr "Ada kesalahan saat menulis `%s'"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
 "  different file `%s', not allowed"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, fuzzy, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr ""
 "dpkg: %s: PERINGATAN - gagal mengganti nama `%.250s' ke `%.250s': %s \n"
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, fuzzy, perl-format
 msgid "create diversions-new: %s"
 msgstr "Ada kesalahan membaca 'diversions' [i]"
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, fuzzy, perl-format
 msgid "write diversions-new: %s"
 msgstr "Dialihkan oleh %s"
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, fuzzy, perl-format
 msgid "close diversions-new: %s"
 msgstr "Dialihkan oleh %s"
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, fuzzy, perl-format
 msgid "create new diversions-old: %s"
 msgstr "Ada kesalahan membaca 'diversions' [i]"
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, fuzzy, perl-format
 msgid "install new diversions: %s"
 msgstr "tidak bisa memasang versi baru dari `%.255s'"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, fuzzy, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "%s: ada kesalahan gzip internal: write: `%s'"
@@ -5040,223 +5040,193 @@ msgstr "(tidak ada keterangan yang tersedia)"
 msgid "Current `best' version is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
+#, 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:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr ""
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
+msgstr ""
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr "%s (subproses): %s \n"
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr ""
+
+#: scripts/update-alternatives.pl:288
+#, fuzzy, perl-format
+msgid "unable to remove %s: %s"
+msgstr "tidak bisa menjalankan perintah %s"
+
+#: scripts/update-alternatives.pl:301
 #, fuzzy, perl-format
 msgid "unknown argument `%s'"
 msgstr "jenis kompresi `%s' tidak dikenal!"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr ""
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, fuzzy, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s butuh suatu argumen nama berkas .deb"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, fuzzy, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s tidak perlu argumen"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:293
+#: scripts/update-alternatives.pl:351
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
 msgstr ""
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr ""
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, fuzzy, perl-format
-msgid "unable to remove %s: %s"
-msgstr "tidak bisa menjalankan perintah %s"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
 "Switching to manual updates only."
 msgstr ""
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, 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:392
+#: scripts/update-alternatives.pl:448
 #, fuzzy, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Sedang membuka paket %s (dari %s) ... \n"
 
-#: scripts/update-alternatives.pl:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, fuzzy, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "gagal melakukan 'stat' %s `%.250s'"
 
-#: scripts/update-alternatives.pl:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:489
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 
-#: scripts/update-alternatives.pl:447
+#: scripts/update-alternatives.pl:503
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: scripts/update-alternatives.pl:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr ""
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr ""
 
-#: scripts/update-alternatives.pl:497
+#: scripts/update-alternatives.pl:551
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:501
+#: scripts/update-alternatives.pl:555
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr ""
 
-#: scripts/update-alternatives.pl:516
+#: scripts/update-alternatives.pl:569
 #, fuzzy, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "gagal membuka berkas sumber %.250s'"
 
-#: scripts/update-alternatives.pl:539
+#: scripts/update-alternatives.pl:592
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr ""
 
-#: scripts/update-alternatives.pl:553
-#, 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:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, fuzzy, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr "tidak bisa menjalankan %s baru"
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, 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:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, fuzzy, perl-format
-msgid "unable to install %s as %s: %s"
-msgstr "tidak bisa memasang `%.250s' sebagai `%.250s'"
-
-#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr ""
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr ""
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr ""
-
-#: scripts/update-alternatives.pl:600
-#, 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:634
+#: scripts/update-alternatives.pl:631
 #, 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:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
 "(%s). Nothing to configure.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5265,45 +5235,54 @@ msgid ""
 "-----------------------------------------------\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 
-#: scripts/update-alternatives.pl:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr ""
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, fuzzy, perl-format
 msgid "error writing stdout: %s"
 msgstr "Ada kesalahan saat menulis `%s'"
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:696
 #, fuzzy, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "ada kesalahan saat membaca %s dari %.255s"
 
-#: scripts/update-alternatives.pl:736
+#: scripts/update-alternatives.pl:698
 #, fuzzy, perl-format
 msgid "missing newline after %s"
 msgstr "berkas `%.250s' terkorupsi - baris-baru hilang setelah %.250s"
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, 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:715
+#, fuzzy, perl-format
+msgid "unable to install %s as %s: %s"
+msgstr "tidak bisa memasang `%.250s' sebagai `%.250s'"
+
+#: scripts/update-alternatives.pl:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr ""
 
+#, fuzzy
+#~ msgid "unable to ensure %s nonexistent: %s"
+#~ msgstr "tidak bisa menjalankan %s baru"
+
 #~ msgid "warning"
 #~ msgstr "PERINGATAN"
 
diff --git a/po/it.po b/po/it.po
index e0b5fa1e..13492f58 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-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\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"
@@ -4621,7 +4621,7 @@ msgid "unable to close %s after read: %s"
 msgstr "impossibile chiudere %s dopo la lettura: %s"
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "impossibile chiudere %s: %s"
@@ -4715,7 +4715,7 @@ msgstr ""
 "e --divert.\n"
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, fuzzy, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr "sono state specificate due modalità: %s e --%s"
@@ -4739,13 +4739,13 @@ msgid "package may not contain newlines"
 msgstr "pacchetto non può contenere a-capo"
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s richiede il nome di una directory come parametro"
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "opzione `%s' non riconosciuta"
@@ -4844,12 +4844,12 @@ msgstr "impossibile eseguire stat sul nome precedente `%s': %s"
 msgid "cannot stat new name `%s': %s"
 msgstr "impossibile eseguire stat sul nuovo nome `%s': %s"
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "errore controllando `%s': %s"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4858,47 +4858,47 @@ msgstr ""
 "il cambio del nome comporta la sovrascrittura di `%s' con\n"
 "  un file diverso `%s', che non è consentito"
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "rename: rimozione duplicato del vecchio collegamento `%s': %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "rename: cambiando il nome da `%s' a `%s': %s"
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "creazione di diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "scrittura di diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "chiusura di diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "rimozione del diversions-old precedente: %s"
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "creazione nuovo diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "installazione nuovo diversions: %s"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "errore interno: %s è corrotto: %s"
@@ -5438,54 +5438,88 @@ msgstr "Nessuna versione disponibile."
 msgid "Current `best' version is %s."
 msgstr "La `migliore' versione attualmente è %s."
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
+#, fuzzy, perl-format
+msgid ""
+"warning: %s is supposed to be a symlink to %s, \n"
+"or nonexistent; however, readlink failed: %s"
+msgstr ""
+"attenzione: %s dovrebbe essere un symlink a %s\n"
+" (o non esistere affatto); invece, readlink è fallita: %s"
+
+#: scripts/update-alternatives.pl:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr "Lascio %s (%s) puntare a %s."
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
+msgstr "Aggiorno %s (%s) che punti a %s."
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr "Uso `%s' per fornire `%s'."
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr "Rimuovo %s (%s), non appropriato con %s."
+
+#: scripts/update-alternatives.pl:288
+#, perl-format
+msgid "unable to remove %s: %s"
+msgstr "impossibile rimuovere %s: %s"
+
+#: scripts/update-alternatives.pl:301
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "parametro sconosciuto `%s'"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install necessita di <link> <nome> <percorso> <priorità>"
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr "la priorità deve essere un numero intero"
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s richiede <nome> e <percorso>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s necessita di <nome>"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave necessita di <link> <nome> <percorso>"
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "nome slave %s duplicato"
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "link slave %s duplicato"
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "il nome %s è sia primario che slave"
 
-#: scripts/update-alternatives.pl:293
+#: scripts/update-alternatives.pl:351
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "il link %s è sia primario che slave"
 
-#: scripts/update-alternatives.pl:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5493,31 +5527,21 @@ msgstr ""
 "necessita --display, --config, --set, --install, --remove, --all, --remove-"
 "all o --auto"
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr "--slave è consentito solo con --install"
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Nessuna alternativa per %s."
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Imposto la selezione automatica di %s."
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, perl-format
-msgid "unable to remove %s: %s"
-msgstr "impossibile rimuovere %s: %s"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5526,7 +5550,7 @@ msgstr ""
 "%s è stato modificato (da te o da uno script).\n"
 "Passo all'aggiornamento esclusivamente manuale."
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5536,124 +5560,68 @@ msgstr ""
 "(Se desideri puoi modificare direttamente quei link simbolici, vedi `man "
 "ln'.)"
 
-#: scripts/update-alternatives.pl:392
+#: scripts/update-alternatives.pl:448
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Rinomino il link %s da %s a %s."
 
-#: scripts/update-alternatives.pl:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "impossibile rinominare %s a %s: %s"
 
-#: scripts/update-alternatives.pl:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "nome link slave %s duplicato"
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, 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:433
+#: scripts/update-alternatives.pl:489
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 "Rimuovo le alternative selezionte manualmente, passo alla modalità automatica"
 
-#: scripts/update-alternatives.pl:447
+#: scripts/update-alternatives.pl:503
 #, 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:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Scarto il link slave obsoleto %s (%s)."
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, 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:497
+#: scripts/update-alternatives.pl:551
 #, 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:501
+#: scripts/update-alternatives.pl:555
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Ripristino da un precedente aggiornamento fallito di %s ..."
 
-#: scripts/update-alternatives.pl:516
+#: scripts/update-alternatives.pl:569
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "impossibile aprire %s in scrittura: %s"
 
-#: scripts/update-alternatives.pl:539
+#: scripts/update-alternatives.pl:592
 #, 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:553
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a symlink to %s\n"
-" (or nonexistent); however, readlink failed: %s"
-msgstr ""
-"attenzione: %s dovrebbe essere un symlink a %s\n"
-" (o non esistere affatto); invece, readlink è fallita: %s"
-
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr "impossibile assicurare che %s non esiste: %s"
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, 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:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, perl-format
-msgid "unable to install %s as %s: %s"
-msgstr "impossibile installare %s come %s: %s"
-
-#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr "Lascio %s (%s) puntare a %s."
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr "Aggiorno %s (%s) che punti a %s."
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr "Rimuovo %s (%s), non appropriato con %s."
-
-#: scripts/update-alternatives.pl:600
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a slave symlink to\n"
-" %s, or nonexistent; however, readlink failed: %s"
-msgstr ""
-"attenzione: %s dovrebbe essere un symlink slave a %s,\n"
-" o non esistere; invece, readlink è fallita: %s"
-
-#: scripts/update-alternatives.pl:634
+#: scripts/update-alternatives.pl:631
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5662,7 +5630,7 @@ msgstr ""
 "C'è un solo programma che fornisce %s\n"
 "(%s). Non c'è nulla da configurare.\n"
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5671,7 +5639,7 @@ msgstr ""
 "C'è un solo programma che fornisce %s\n"
 "(%s). Non c'è nulla da configurare.\n"
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5684,47 +5652,62 @@ msgstr ""
 "  Selezione    Alternativa\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 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:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr "Uso `%s' per fornire `%s'."
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Non riesco a trovare l'alternativa `%s'."
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "errore scrivendo su stdout: %s"
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, 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:735
+#: scripts/update-alternatives.pl:696
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "errore o eof leggendo %s per %s (%s)"
 
-#: scripts/update-alternatives.pl:736
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "missing newline after %s"
 msgstr "manca un a-capo dopo %s"
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, 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:715
+#, perl-format
+msgid "unable to install %s as %s: %s"
+msgstr "impossibile installare %s come %s: %s"
+
+#: scripts/update-alternatives.pl:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Problema grave: %s"
 
+#~ msgid "unable to ensure %s nonexistent: %s"
+#~ msgstr "impossibile assicurare che %s non esiste: %s"
+
+#~ msgid ""
+#~ "warning: %s is supposed to be a slave symlink to\n"
+#~ " %s, or nonexistent; however, readlink failed: %s"
+#~ msgstr ""
+#~ "attenzione: %s dovrebbe essere un symlink slave a %s,\n"
+#~ " o non esistere; invece, readlink è fallita: %s"
+
 #~ msgid "warning"
 #~ msgstr "attenzione"
 
diff --git a/po/ja.po b/po/ja.po
index d352c416..7e51774c 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-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\n"
 "PO-Revision-Date: 2007-12-20 14:53+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Debian Japanease List <debian-japanese@lists.debian.org>\n"
@@ -4509,7 +4509,7 @@ msgid "unable to close %s after read: %s"
 msgstr "%s の読み取り後のクローズに失敗しました: %s"
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "%s をクローズできません: %s"
@@ -4601,7 +4601,7 @@ msgstr ""
 "きです。\n"
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr "2 つのコマンドが指定されました: %s と --%s"
@@ -4625,13 +4625,13 @@ msgid "package may not contain newlines"
 msgstr "パッケージは改行を含んではなりません"
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s は引数として <ディレクトリ> が必要です"
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "不明なオプション `%s'"
@@ -4730,12 +4730,12 @@ msgstr "古い名前 `%s' の状態を取得できません: %s"
 msgid "cannot stat new name `%s': %s"
 msgstr "新しい名前 `%s' の状態を取得できません: %s"
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "`%s' の確認中にエラーが発生しました: %s"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4744,47 +4744,47 @@ msgstr ""
 "名前変更は `%s' を異なるファイル `%s' で上書きすることを伴います。\n"
 "これは許可されていません。"
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "名前変更: 重複する古いリンク `%s' を削除してください: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "名前変更: `%s' を `%s' に名前変更します: %s"
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "diversions-new を作成: %s"
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "diversions-new を書き込み: %s"
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "diversions-new をクローズ: %s"
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "古い diversions-old を削除: %s"
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "新しい diversions-old を作成: %s"
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "新しい退避をインストール: %s"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "内部エラー: %s は壊れています: %s"
@@ -5319,54 +5319,88 @@ msgstr "利用可能なバージョンはありません。"
 msgid "Current `best' version is %s."
 msgstr "現在の `最適' バージョンは %s です。"
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
+#, fuzzy, perl-format
+msgid ""
+"warning: %s is supposed to be a symlink to %s, \n"
+"or nonexistent; however, readlink failed: %s"
+msgstr ""
+"警告: %s は %s へのシンボリックリンク (あるいは存在しない) であると想定\n"
+"されています; しかし、readlink が失敗しました: %s"
+
+#: scripts/update-alternatives.pl:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr "%3$s を指している %1$s (%2$s) をそのままにします。"
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
+msgstr "%3$s を指している %1$s (%2$s) を更新しています。"
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr "`%2$s' を提供するために `%1$s' を使います。"
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr "%3$s に適当でない %1$s を削除しています (%2$s)。"
+
+#: scripts/update-alternatives.pl:288
+#, perl-format
+msgid "unable to remove %s: %s"
+msgstr "%s を削除できません: %s"
+
+#: scripts/update-alternatives.pl:301
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "`%s' は不明な引数です"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install は<リンク> <名前> <パス> <優先度> が必要です"
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr "優先度は整数でなければなりません"
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s は <名前> <パス> が必要です"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s は <名前> が必要です"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave は<リンク> <名前> <パス> が必要です"
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "スレーブ名 %s が重複しています"
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "スレーブリンク %s が重複しています"
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "名前 %s がプライマリ/スレーブの両方にあります"
 
-#: scripts/update-alternatives.pl:293
+#: scripts/update-alternatives.pl:351
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "リンク %s がプライマリ/スレーブの両方にあります"
 
-#: scripts/update-alternatives.pl:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5374,31 +5408,21 @@ msgstr ""
 "--display、--config、--set、--install、--remove、--all、--remove-all、--auto "
 "のいずれかが必要です。"
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr "--slave は --install と一緒のみ許可されています"
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "%s の alternatives がありません。"
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "%s の自動選択を設定しています。"
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, perl-format
-msgid "unable to remove %s: %s"
-msgstr "%s を削除できません: %s"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5407,7 +5431,7 @@ msgstr ""
 "%s が (手動あるいはスクリプトにより) 変更されました。\n"
 "手動更新のみに切り替えています。"
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5417,125 +5441,69 @@ msgstr ""
 "(望むなら、これらのシンボリックリンクをあなた自身で変更することもできます。"
 "`man ln' を参照してください。)"
 
-#: scripts/update-alternatives.pl:392
+#: scripts/update-alternatives.pl:448
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "%s のリンクを %s から %s に名前変更しています。"
 
-#: scripts/update-alternatives.pl:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "%s から %s に名前変更できません: %s"
 
-#: scripts/update-alternatives.pl:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "スレーブリンク名 %s が重複しています"
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "%s のスレーブリンクを %s から %s に名前変更しています。"
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:489
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 "手動で選択された alternative を削除しています - 自動モードに切り替えています"
 
-#: scripts/update-alternatives.pl:447
+#: scripts/update-alternatives.pl:503
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "%2$s の alternative %1$s は登録されていません。削除は行いません。"
 
-#: scripts/update-alternatives.pl:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "古いスレーブリンク %s を破棄しています (%s)。"
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "%s の自動更新は無効になっています。そのままにしておきます。"
 
-#: scripts/update-alternatives.pl:497
+#: scripts/update-alternatives.pl:551
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr "自動更新に戻るには、`update-alternatives --auto %s' を使ってください。"
 
-#: scripts/update-alternatives.pl:501
+#: scripts/update-alternatives.pl:555
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "以前に失敗した %s の更新を修復しています ..."
 
-#: scripts/update-alternatives.pl:516
+#: scripts/update-alternatives.pl:569
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "%s を書き込み用にオープンできません: %s"
 
-#: scripts/update-alternatives.pl:539
+#: scripts/update-alternatives.pl:592
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr ""
 "%s (%s) を提供する最後のパッケージが削除されました。alternative を削除してい"
 "ます。"
 
-#: scripts/update-alternatives.pl:553
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a symlink to %s\n"
-" (or nonexistent); however, readlink failed: %s"
-msgstr ""
-"警告: %s は %s へのシンボリックリンク (あるいは存在しない) であると想定\n"
-"されています; しかし、readlink が失敗しました: %s"
-
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr "%s が存在しないことを確定できません: %s"
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, perl-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "%s から %s へのシンボリックリンクを作成できません: %s"
-
-#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, perl-format
-msgid "unable to install %s as %s: %s"
-msgstr "%s を %s としてインストールできません: %s"
-
-#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr "%3$s を指している %1$s (%2$s) をそのままにします。"
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr "%3$s を指している %1$s (%2$s) を更新しています。"
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr "%3$s に適当でない %1$s を削除しています (%2$s)。"
-
-#: scripts/update-alternatives.pl:600
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a slave symlink to\n"
-" %s, or nonexistent; however, readlink failed: %s"
-msgstr ""
-"警告: %s は %s へのスレーブシンボリックリンク (あるいは存在しない) であると想"
-"定されています; しかし、readlink が失敗しました: %s"
-
-#: scripts/update-alternatives.pl:634
+#: scripts/update-alternatives.pl:631
 #, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5544,7 +5512,7 @@ msgstr ""
 "%s を提供するプログラムがありません。\n"
 "設定は行いません。\n"
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5553,7 +5521,7 @@ msgstr ""
 "%s を提供するプログラムが 1 つしかありません (%s)。\n"
 "設定は行いません。\n"
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5566,44 +5534,59 @@ msgstr ""
 "  選択肢       alternative\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 "デフォルト[*] のままにするには Enter、さもなければ選択肢の番号のキーを押して"
 "ください: "
 
-#: scripts/update-alternatives.pl:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr "`%2$s' を提供するために `%1$s' を使います。"
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "alternative `%s' が見つかりません。"
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "標準出力への書き込み中にエラーが発生しました: %s"
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "update-alternatives ファイル内での改行は禁止されています (%s)"
 
-#: scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:696
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr ""
 "%2$s の %1$s の読み取り中にエラーが発生したか eof を読み取りました (%3$s)"
 
-#: scripts/update-alternatives.pl:736
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "missing newline after %s"
 msgstr "%s の後の改行がありません"
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, perl-format
+msgid "unable to make %s a symlink to %s: %s"
+msgstr "%s から %s へのシンボリックリンクを作成できません: %s"
+
+#: scripts/update-alternatives.pl:715
+#, perl-format
+msgid "unable to install %s as %s: %s"
+msgstr "%s を %s としてインストールできません: %s"
+
+#: scripts/update-alternatives.pl:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "深刻な問題: %s"
+
+#~ msgid "unable to ensure %s nonexistent: %s"
+#~ msgstr "%s が存在しないことを確定できません: %s"
+
+#~ msgid ""
+#~ "warning: %s is supposed to be a slave symlink to\n"
+#~ " %s, or nonexistent; however, readlink failed: %s"
+#~ msgstr ""
+#~ "警告: %s は %s へのスレーブシンボリックリンク (あるいは存在しない) である"
+#~ "と想定されています; しかし、readlink が失敗しました: %s"
diff --git a/po/km.po b/po/km.po
index 7aade5a9..425f188e 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-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\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"
@@ -4355,7 +4355,7 @@ msgid "unable to close %s after read: %s"
 msgstr "មិន​អាច​បិទ %s បន្ទាប់​ពី​អាន ៖ %s"
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "មិន​អាច​បិទ %s ៖ %s"
@@ -4444,7 +4444,7 @@ msgstr ""
 "ស្គ្រីប​កញ្ចប់ preinst/postrm គួរតែ​បញ្ជា​ជា​និច្ច --package និង --divert ។\n"
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, fuzzy, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr "មាន​ពីរ​របៀប​បាន​បញ្ជាក់ ៖ %s និង --%s"
@@ -4468,13 +4468,13 @@ msgid "package may not contain newlines"
 msgstr "កញ្ចប់​មិនអាច​មាន​បន្ទាត់​ថ្មី"
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s ត្រូវការ​អាគុយម៉ង់ <ថត>"
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "មិន​​ស្គា​ល់​ជម្រើស​ `%s'"
@@ -4573,12 +4573,12 @@ msgstr "មិន​អាច​ចាប់​ផ្ដើម​ឈ្មោះ
 msgid "cannot stat new name `%s': %s"
 msgstr "មិន​អាច​ចាប់ផ្ដើម​ឈ្មោះ​ថ្មី `%s' ៖ %s"
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "កំហុស​ក្នុង​ការ​ពិនិត្យ `%s' ៖ %s"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4587,47 +4587,47 @@ msgstr ""
 "ប្ដូរ​ឈ្មោះ​ពាក់ព័ន្ធ​នឹង​ការ​សរសេរ​ជាន់​លើ `%s' ដោយ\n"
 "  ឯកសារ​ផ្សេង `%s' មិន​បាន​អនុញ្ញាត"
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "ប្ដូរឈ្មោះ ៖ យក​តំណ​ចាស់​ដែល​ស្ទួន​ចេញ `%s' ៖ %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "ប្ដូរឈ្មោះ ៖ ប្ដូរឈ្មោះ `%s' ទៅជា `%s' ៖ %s"
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "បង្កើត​ការ​បង្វែរ​ថ្មី ៖ %s"
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "សរសេរ​ការ​បង្វែរ​ថ្មី ៖ %s"
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "បិទ​ការ​បង្វែរ​ថ្មី ៖ %s"
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "យក​ការ​បង្វែរ​ចាស់​ចេញ ៖ %s"
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "បង្កើត​ការ​បង្វែរ​ចាស់ ៖ %s"
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "ដំឡើង​ការ​បង្វែរ​ថ្មី ៖ %s"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "កំហុស​ខាង​ក្នុង ៖ %s ខូច ៖ %s"
@@ -5144,54 +5144,88 @@ msgstr "គ្មានកំណែ ។"
 msgid "Current `best' version is %s."
 msgstr "កំណែ `ល្អ​បំផុត' បច្ចុប្បន្ន​គឺ %s ។"
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
+#, fuzzy, perl-format
+msgid ""
+"warning: %s is supposed to be a symlink to %s, \n"
+"or nonexistent; however, readlink failed: %s"
+msgstr ""
+"ព្រមាន ៖ %s ត្រូវ​បាន​សន្មត់​ថា​ជា​តំណ​និមិត្ត​សញ្ញា​ទៅ %s\n"
+" (ឬ​មិ​នទាន់​មាន) ទោះ​ជា​យ៉ាង​ណា​ក៏​ដោយ ការ​អាន​តំណ​បាន​បរាជ័យ ៖ %s"
+
+#: scripts/update-alternatives.pl:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr "ទុកឲ្យ %s (%s) ចង្អុលទៅ %s ។"
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
+msgstr "ធ្វើ​ឲ្យ %s (%s) ទាន់​សម័យ ដើម្បី​ចង្អុល​ទៅ %s ។"
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr "ការ​ប្រើ `%s' ដើម្បី​ផ្ដល់ `%s' ។"
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr "យក %s (%s) ចេញ មិន​សម​នឹង %s ។"
+
+#: scripts/update-alternatives.pl:288
+#, perl-format
+msgid "unable to remove %s: %s"
+msgstr "មិន​អាច​យក %s ៖ %s ចេញ"
+
+#: scripts/update-alternatives.pl:301
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "មិន​ស្គាល់​អាគុយម៉ង់​ `%s'"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install ត្រូវការ <តំណ> <ឈ្មោះ> <ផ្លូវ> <អាទិភាព>"
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr "អាទិភាព​ត្រូវតែ​ជា​ចំនួន​គត់"
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s ត្រូវការ <ឈ្មោះ> <ផ្លូវ>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s ត្រូវការ <ឈ្មោះ>"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave ត្រូវការ <តំណ> <ឈ្មោះ> <ផ្លូវ>"
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "ឈ្មោះ​កូនចៅ %s បាន​ស្ទួន​"
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "តំណ​កូនចៅ​ %s បាន​ស្ទួន​"
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "ឈ្មោះ %s គឺ​ទាំង​មេ និង​កូនចៅ"
 
-#: scripts/update-alternatives.pl:293
+#: scripts/update-alternatives.pl:351
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "តំណ %s គឺ​ទាំង​មេ និង​កូនចៅ"
 
-#: scripts/update-alternatives.pl:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5199,31 +5233,21 @@ msgstr ""
 "ត្រូវការ --display, --config, --set, --install, --remove, --all, --remove-all "
 "ឬ --auto"
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr "--slave បាន​អនុញ្ញាត​តែ​ជា​មួយ --install ប៉ុណ្ណោះ"
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "គ្មាន​ជម្រើ​សម្រាប់ %s ។"
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "រៀបចំ​ជម្រើស​ស្វ័យប្រវត្តិ​របស់ %s ។"
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, perl-format
-msgid "unable to remove %s: %s"
-msgstr "មិន​អាច​យក %s ៖ %s ចេញ"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5232,7 +5256,7 @@ msgstr ""
 "%s ត្រូវ​បាន​ផ្លាស់ប្ដូរ (ដោយ​ដៃ ឬ​ដោយ​ស្គ្រីប) ។\n"
 "ប្ដូរទៅ​ជា​ការ​ធ្វើ​ឲ្យ​ទាន់​សម័យ​ដោយ​ដៃ​តែ​ប៉ុណ្ណោះ ។"
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5241,122 +5265,66 @@ msgstr ""
 "កំពុងពិនិត្យមើលកំណែដែលមានរបស់ %s ធ្វើឲ្យតំណទាន់សម័យក្នុង %s ...\n"
 "(អ្នកអាចកែប្រែតំណនិមិត្តសញ្ញានៅទីនោះ ប្រសិនបើអ្នកចង់បាន - មើល `man ln' ។)"
 
-#: scripts/update-alternatives.pl:392
+#: scripts/update-alternatives.pl:448
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "ប្ដូរ​ឈ្មោះ​តំណ %s ពី %s ទៅជា %s ។"
 
-#: scripts/update-alternatives.pl:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "មិន​អាច​ប្ដូរ​ឈ្មោះ %s ទៅ​ជា %s ៖ %s"
 
-#: scripts/update-alternatives.pl:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "ឈ្មោះ​តំណ​កូន​ចៅ​ %s បាន​ស្ទួន​"
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "ប្ដូរ​ឈ្មោះ​តំណ​កូនចៅ %s ពី %s ទៅជា %s ។"
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:489
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "យក​ជម្រើស​ដែល​បាន​ជ្រើស​ចេញ​ដោយ​ដៃ - ប្ដូរ​ទៅ​ជា​របៀប​ស្វ័យប្រវត្តិ"
 
-#: scripts/update-alternatives.pl:447
+#: scripts/update-alternatives.pl:503
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "ជម្រើស %s សម្រាប់ %s មិន​បាន​ចុះ​ឈ្មោះ មិន​យក​ចេញ​ទេ"
 
-#: scripts/update-alternatives.pl:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "បោះបង់​តំណ​កូន​ចៅ​ដែល​លែង​ប្រើ %s (%s) ។"
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "ការ​ធ្វើឲ្យ​ទាន់​សម័យ​ដោយ​ស្វ័យប្រវត្តិ​របស់ %s ត្រូវ​បាន​មិន​អនុញ្ញាត ទុក​វា​ឲ្យ​នៅ​តែឯង ។"
 
-#: scripts/update-alternatives.pl:497
+#: scripts/update-alternatives.pl:551
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr "ដើម្បី​ត្រឡ​ប់ទៅ​ការ​ធ្វើ​ឲ្យ​ទាន់​សម័យ​ដោយ​ស្វ័យប្រវត្តិ ប្រើ `ជម្រើស​ធ្វើ​ឲ្យទាន់​សម័យ --auto %s'."
 
-#: scripts/update-alternatives.pl:501
+#: scripts/update-alternatives.pl:555
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "កំពុង​សង្គ្រោះ​ការ​ធ្វើ​ឲ្យ​ទាន់​សម័យ​ដែល​បាន​បរាជ័យ​ពី​មុន​របស់ %s ឡើង​វិញ..."
 
-#: scripts/update-alternatives.pl:516
+#: scripts/update-alternatives.pl:569
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "មិន​អាច​បើក %s ដើម្បី​សរសេរ ៖ %s"
 
-#: scripts/update-alternatives.pl:539
+#: scripts/update-alternatives.pl:592
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "ការ​ផ្ដល់​កញ្ចប់​ចុង​ក្រោយ %s (%s) បាន​យក​ចេញ លុប​វា ។"
 
-#: scripts/update-alternatives.pl:553
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a symlink to %s\n"
-" (or nonexistent); however, readlink failed: %s"
-msgstr ""
-"ព្រមាន ៖ %s ត្រូវ​បាន​សន្មត់​ថា​ជា​តំណ​និមិត្ត​សញ្ញា​ទៅ %s\n"
-" (ឬ​មិ​នទាន់​មាន) ទោះ​ជា​យ៉ាង​ណា​ក៏​ដោយ ការ​អាន​តំណ​បាន​បរាជ័យ ៖ %s"
-
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr "មិន​អាច​ប្រាកដ​ថា %s មិន​ទាន់​មាន ៖ %s"
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, perl-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "មិន​អាច​បង្កើត​តំណ​និមិត្ត​សញ្ញា %s ទៅ %s ៖ %s"
-
-#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, perl-format
-msgid "unable to install %s as %s: %s"
-msgstr "មិន​អាច​ដំឡើង %s ជា %s ៖ %s"
-
-#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr "ទុកឲ្យ %s (%s) ចង្អុលទៅ %s ។"
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr "ធ្វើ​ឲ្យ %s (%s) ទាន់​សម័យ ដើម្បី​ចង្អុល​ទៅ %s ។"
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr "យក %s (%s) ចេញ មិន​សម​នឹង %s ។"
-
-#: scripts/update-alternatives.pl:600
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a slave symlink to\n"
-" %s, or nonexistent; however, readlink failed: %s"
-msgstr ""
-"ព្រមាន ៖ %s ត្រូវ​បាន​សន្មត់​ថា​ជា​តំណ​និមិត្ត​សញ្ញា​កូនចៅ​ទៅ\n"
-" %s ឬ​មិន​ទាន់​មាន ទោះ​ជា​យ៉ាងណាក៏ដោយ ការ​អាន​តំណ​បាន​បរាជ័យ ៖ %s"
-
-#: scripts/update-alternatives.pl:634
+#: scripts/update-alternatives.pl:631
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5365,7 +5333,7 @@ msgstr ""
 "មាន​តែ​កម្មវិធី​តែ ១ ប៉ុណ្ណោះ​ដែល​ផ្ដល់ %s\n"
 "(%s) ។ គ្មាន​អ្វី​ត្រូវ​កំណត់​រចនាសម្ព័ន្ធ ។\n"
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5374,7 +5342,7 @@ msgstr ""
 "មាន​តែ​កម្មវិធី​តែ ១ ប៉ុណ្ណោះ​ដែល​ផ្ដល់ %s\n"
 "(%s) ។ គ្មាន​អ្វី​ត្រូវ​កំណត់​រចនាសម្ព័ន្ធ ។\n"
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5387,45 +5355,60 @@ msgstr ""
 "  ជម្រើស    ជំនួស\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr "សង្កត់​គ្រាប់ចុច បញ្ចូល ដើម្បី​រក្សា​លំនាំដើម[*] ឬ​វាយ​លេខ​ជម្រើស ៖ "
 
-#: scripts/update-alternatives.pl:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr "ការ​ប្រើ `%s' ដើម្បី​ផ្ដល់ `%s' ។"
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "មិន​អាច​រក​ជម្រើស `%s' ។"
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "កំហុស​ក្នុង​ការ​សរសេរ stdout ៖ %s"
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "បន្ទាត់​ថ្មី​បាន​ហាមឃាត់​ក្នុង​ឯកសារ​ជម្រើស​ធ្វើឲ្យ​ទាន់​សម័យ (%s)"
 
-#: scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:696
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "ការ​អាន​កំហុស ឬ ចុង​ឯកសារ %s សម្រាប់ %s (%s)"
 
-#: scripts/update-alternatives.pl:736
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "missing newline after %s"
 msgstr "បាត់​បន្ទាត់​ថ្មី​បន្ទាប់​ពី %s"
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, perl-format
+msgid "unable to make %s a symlink to %s: %s"
+msgstr "មិន​អាច​បង្កើត​តំណ​និមិត្ត​សញ្ញា %s ទៅ %s ៖ %s"
+
+#: scripts/update-alternatives.pl:715
+#, perl-format
+msgid "unable to install %s as %s: %s"
+msgstr "មិន​អាច​ដំឡើង %s ជា %s ៖ %s"
+
+#: scripts/update-alternatives.pl:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "បញ្ហាធ្ងន់ធ្ងរ ៖ %s"
 
+#~ msgid "unable to ensure %s nonexistent: %s"
+#~ msgstr "មិន​អាច​ប្រាកដ​ថា %s មិន​ទាន់​មាន ៖ %s"
+
+#~ msgid ""
+#~ "warning: %s is supposed to be a slave symlink to\n"
+#~ " %s, or nonexistent; however, readlink failed: %s"
+#~ msgstr ""
+#~ "ព្រមាន ៖ %s ត្រូវ​បាន​សន្មត់​ថា​ជា​តំណ​និមិត្ត​សញ្ញា​កូនចៅ​ទៅ\n"
+#~ " %s ឬ​មិន​ទាន់​មាន ទោះ​ជា​យ៉ាងណាក៏ដោយ ការ​អាន​តំណ​បាន​បរាជ័យ ៖ %s"
+
 #~ msgid "warning"
 #~ msgstr "ការ​ព្រមាន​"
 
diff --git a/po/ko.po b/po/ko.po
index 6b784c8e..27068c48 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-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\n"
 "PO-Revision-Date: 2007-09-16 23:53-0400\n"
 "Last-Translator: Sunjae Park <darehanl@gmail.com>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -4459,7 +4459,7 @@ msgid "unable to close %s after read: %s"
 msgstr "%s 읽은 후에 닫는 데 실패했습니다: %s"
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "%s 닫을 수 없습니다: %s"
@@ -4548,7 +4548,7 @@ msgstr ""
 "divert을 지정하는 것이 좋습니다.\n"
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr "두 가지 명령이 지정되었습니다: %s와 --%s"
@@ -4572,13 +4572,13 @@ msgid "package may not contain newlines"
 msgstr "꾸러미에 새줄문자가 있어서는 안 됩니다"
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s 옵션은 <directory> 인수가 필요합니다"
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "알 수 없는 옵션 '%s'"
@@ -4677,12 +4677,12 @@ msgstr "예전 이름 '%s'의 정보를 읽을 수 없습니다 : %s"
 msgid "cannot stat new name `%s': %s"
 msgstr "새 이름 '%s'의 정보를 읽을 수 없습니다 : %s"
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "'%s' 검사하는 데 오류가 발생했습니다: %s"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4691,47 +4691,47 @@ msgstr ""
 "rename은 '%s'을(를) 다른 파일 '%s'(으)로 \n"
 "  덮어씌우는 작업이므로 허용하지 않습니다"
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "rename: 중복된 예전 링크 '%s' 지웁니다: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "rename: '%s' 파일을 '%s' 파일로 이름 바꿉니다: %s"
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "diversions-new 생성합니다: %s"
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "diversions-new 씁니다: %s"
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "diversions-new 닫습니다: %s"
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "예전 diversions-old 지웁니다: %s"
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "새로운 diversions-old 생성합니다: %s"
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "새로운 우회경로(diversions) 설치합니다: %s"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "내부 오류: '%s' 망가졌습니다: %s"
@@ -5258,54 +5258,88 @@ msgstr "버전 없음."
 msgid "Current `best' version is %s."
 msgstr "현재 가장 '좋은' 버전은 %s입니다."
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
+#, fuzzy, perl-format
+msgid ""
+"warning: %s is supposed to be a symlink to %s, \n"
+"or nonexistent; however, readlink failed: %s"
+msgstr ""
+"경고: %s은(는) %s로의 symlink이어야 하거나 \n"
+"없어야 하지만 readlink가 실패했습니다. %s"
+
+#: scripts/update-alternatives.pl:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr "%s(%s)이(가) %s을(를) 계속 가리키도록 둡니다."
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
+msgstr "%s(%s)이(가) %s을(를) 가리키도록 바꿉니다."
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr "'%s'이(가) %s을(를) 제공하도록 하는 중."
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr "%3$s에 적절하지 않으므로 %1$s(%2$s) 지우는 중."
+
+#: scripts/update-alternatives.pl:288
+#, perl-format
+msgid "unable to remove %s: %s"
+msgstr "%s을(를) 지울 수 없습니다: %s"
+
+#: scripts/update-alternatives.pl:301
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "알 수 없는 인수 '%s'"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install은 <link> <name> <path> <priority>를 필요로 합니다"
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr "priority는 정수여야 합니다"
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s 옵션은 <name> <path>을(를) 필요로 합니다"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s 옵션은 <name>을(를) 필요로 합니다"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave는 <link> <name> <path>를 필요로 합니다"
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "슬레이브의 이름 %s이(가) 중복되었습니다"
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "슬레이브 연결 %s 중복되었습니다"
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "이름 %s은(는) 프라이머리와 슬레이브 둘 다입니다"
 
-#: scripts/update-alternatives.pl:293
+#: scripts/update-alternatives.pl:351
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "연결 %s은(는) 프라이머리와 슬레이브 둘 다입니다"
 
-#: scripts/update-alternatives.pl:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5313,31 +5347,21 @@ msgstr ""
 "--display이나 --config, --set, --install, --remove, --all, --remove-all, --"
 "auto를 필요로 합니다."
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr "--slave는 --install와 함께 사용해야 합니다"
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "%s의 대체 항목이 없습니다."
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "%s의 자동 선택을 설정하는 중입니다."
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, perl-format
-msgid "unable to remove %s: %s"
-msgstr "%s을(를) 지울 수 없습니다: %s"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5346,7 +5370,7 @@ msgstr ""
 "%s 변경되었습니다(수동으로 직접, 혹은 스크립트로).\n"
 "수동 업데이트만 사용하기로 변경합니다."
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5355,125 +5379,69 @@ msgstr ""
 "%s의 사용할 수 있는 버전들을 확인하고 %s에 있는 연결들을 업데이트하는 중...\n"
 "(원한다면 거기에 있는 symlink들을 직접 조작할 수 있습니다 - 'man ln' 참조)."
 
-#: scripts/update-alternatives.pl:392
+#: scripts/update-alternatives.pl:448
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "%s 연결을 %s에서 %s으(로) 이름을 바꿉니다."
 
 # FIXME: bad msgid
-#: scripts/update-alternatives.pl:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "%s을(를) %s(으)로 이름을 바꿀 수 없습니다: %s"
 
-#: scripts/update-alternatives.pl:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "슬레이브 연결의 이름 %s 중복되었습니다"
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "슬레이브 연결 %s의 이름을 %s에서 %s(으)로 변경하는 중입니다."
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:489
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "수동으로 선택한 대체 항목을 지우는 중 - 자동 모드로 변경합니다"
 
-#: scripts/update-alternatives.pl:447
+#: scripts/update-alternatives.pl:503
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "%2$s의 대체 항목 %1$s 등록되지 않았으므로 지우지 않습니다."
 
-#: scripts/update-alternatives.pl:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "사용 중지된 슬레이브 연결 %s 없애는 중(%s)."
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "%s의 자동 업데이트가 중지되었으므로 가만히 둡니다."
 
-#: scripts/update-alternatives.pl:497
+#: scripts/update-alternatives.pl:551
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 "다시 자동업데이트를 사용하려면 'update-alternatives --auto %s'을(를) 사용하십"
 "시오."
 
-#: scripts/update-alternatives.pl:501
+#: scripts/update-alternatives.pl:555
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "전에 실패했던 %s의 업데이트에서 복구하는 중..."
 
-#: scripts/update-alternatives.pl:516
+#: scripts/update-alternatives.pl:569
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "'%s' 쓰기 위해 열 수 없습니다: %s"
 
-#: scripts/update-alternatives.pl:539
+#: scripts/update-alternatives.pl:592
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "%s을(를) 제공하던 마지막 꾸러미(%s)가 제거되었으므로 지웁니다."
 
-#: scripts/update-alternatives.pl:553
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a symlink to %s\n"
-" (or nonexistent); however, readlink failed: %s"
-msgstr ""
-"경고: %s은(는) %s로의 symlink이어야 하거나 \n"
-"없어야 하지만 readlink가 실패했습니다. %s"
-
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr "%s이(가) 없다는 것을 확인할 수 없습니다. %s"
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, perl-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "%s을(를) %s에 대한 심볼릭 링크로 만들 수 없습니다: %s"
-
-#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, perl-format
-msgid "unable to install %s as %s: %s"
-msgstr "%s 파일을 %s 파일로 설치할 수 없습니다: %s"
-
-#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr "%s(%s)이(가) %s을(를) 계속 가리키도록 둡니다."
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr "%s(%s)이(가) %s을(를) 가리키도록 바꿉니다."
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr "%3$s에 적절하지 않으므로 %1$s(%2$s) 지우는 중."
-
-#: scripts/update-alternatives.pl:600
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a slave symlink to\n"
-" %s, or nonexistent; however, readlink failed: %s"
-msgstr ""
-"경고: %s은(는) %s(으)로의 슬레이브 symlink이거나 존재하지\n"
-"않아야하지만 readlink가 실패했습니다. %s"
-
-#: scripts/update-alternatives.pl:634
+#: scripts/update-alternatives.pl:631
 #, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5482,7 +5450,7 @@ msgstr ""
 "%s 제공하는 프로그램이 없습니다.\n"
 "설정할 것이 없습니다.\n"
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5491,7 +5459,7 @@ msgstr ""
 "%s(%s)을(를) 제공하는 프로그램이 하나만 있습니다.\n"
 "설정할 것이 없습니다.\n"
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5504,46 +5472,61 @@ msgstr ""
 "  선택번호     대체항목\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 "기본 사항[*]을 사용하려면 엔터, 다른 것을 사용하려면 번호를 입력하십시오: "
 
-#: scripts/update-alternatives.pl:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr "'%s'이(가) %s을(를) 제공하도록 하는 중."
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "대체항목 '%s' 찾을 수 없습니다."
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "stdout에 쓰는 데 오류가 발생했습니다: %s"
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "update-alternatives 파일(%s)에는 줄바꿈이 금지되어 있습니다."
 
-#: scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:696
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "%2$s에서 %1$s 읽는데 오류가 발생했거나 eof가 있었습니다(%3$s)."
 
-#: scripts/update-alternatives.pl:736
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "missing newline after %s"
 msgstr "%s 다음에 줄바꿈이 없습니다"
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, perl-format
+msgid "unable to make %s a symlink to %s: %s"
+msgstr "%s을(를) %s에 대한 심볼릭 링크로 만들 수 없습니다: %s"
+
+#: scripts/update-alternatives.pl:715
+#, perl-format
+msgid "unable to install %s as %s: %s"
+msgstr "%s 파일을 %s 파일로 설치할 수 없습니다: %s"
+
+#: scripts/update-alternatives.pl:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "심각한 문제: %s"
 
+#~ msgid "unable to ensure %s nonexistent: %s"
+#~ msgstr "%s이(가) 없다는 것을 확인할 수 없습니다. %s"
+
+#~ msgid ""
+#~ "warning: %s is supposed to be a slave symlink to\n"
+#~ " %s, or nonexistent; however, readlink failed: %s"
+#~ msgstr ""
+#~ "경고: %s은(는) %s(으)로의 슬레이브 symlink이거나 존재하지\n"
+#~ "않아야하지만 readlink가 실패했습니다. %s"
+
 #~ msgid "warning"
 #~ msgstr "경고"
 
diff --git a/po/ku.po b/po/ku.po
index 6ab50287..a8758c90 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-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\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"
@@ -4043,7 +4043,7 @@ msgid "unable to close %s after read: %s"
 msgstr ""
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr ""
@@ -4106,7 +4106,7 @@ msgid ""
 msgstr ""
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr ""
@@ -4130,13 +4130,13 @@ msgid "package may not contain newlines"
 msgstr ""
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr ""
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, perl-format
 msgid "unknown option `%s'"
 msgstr ""
@@ -4229,59 +4229,59 @@ msgstr ""
 msgid "cannot stat new name `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
 "  different file `%s', not allowed"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, perl-format
 msgid "install new diversions: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr ""
@@ -4724,223 +4724,193 @@ msgstr ""
 msgid "Current `best' version is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
 #, perl-format
-msgid "unknown argument `%s'"
+msgid ""
+"warning: %s is supposed to be a symlink to %s, \n"
+"or nonexistent; however, readlink failed: %s"
+msgstr ""
+
+#: scripts/update-alternatives.pl:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr ""
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
 msgstr ""
 
 #: scripts/update-alternatives.pl:256
+#, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr ""
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr ""
+
+#: scripts/update-alternatives.pl:288
+#, perl-format
+msgid "unable to remove %s: %s"
+msgstr ""
+
+#: scripts/update-alternatives.pl:301
+#, perl-format
+msgid "unknown argument `%s'"
+msgstr ""
+
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr ""
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, perl-format
 msgid "--%s needs <name>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:293
+#: scripts/update-alternatives.pl:351
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
 msgstr ""
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr ""
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, perl-format
-msgid "unable to remove %s: %s"
-msgstr ""
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
 "Switching to manual updates only."
 msgstr ""
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, 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:392
+#: scripts/update-alternatives.pl:448
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:489
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 
-#: scripts/update-alternatives.pl:447
+#: scripts/update-alternatives.pl:503
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: scripts/update-alternatives.pl:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr ""
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr ""
 
-#: scripts/update-alternatives.pl:497
+#: scripts/update-alternatives.pl:551
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:501
+#: scripts/update-alternatives.pl:555
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr ""
 
-#: scripts/update-alternatives.pl:516
+#: scripts/update-alternatives.pl:569
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:539
+#: scripts/update-alternatives.pl:592
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr ""
 
-#: scripts/update-alternatives.pl:553
-#, 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:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr ""
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, perl-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr ""
-
-#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, perl-format
-msgid "unable to install %s as %s: %s"
-msgstr ""
-
-#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr ""
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr ""
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr ""
-
-#: scripts/update-alternatives.pl:600
-#, 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:634
+#: scripts/update-alternatives.pl:631
 #, 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:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
 "(%s). Nothing to configure.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -4949,41 +4919,46 @@ msgid ""
 "-----------------------------------------------\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 
-#: scripts/update-alternatives.pl:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr ""
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:696
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:736
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "missing newline after %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, perl-format
+msgid "unable to make %s a symlink to %s: %s"
+msgstr ""
+
+#: scripts/update-alternatives.pl:715
+#, perl-format
+msgid "unable to install %s as %s: %s"
+msgstr ""
+
+#: scripts/update-alternatives.pl:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Pirsgirêka cidî: %s"
diff --git a/po/mr.po b/po/mr.po
index 842e0872..9c3d77b8 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-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\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 "
@@ -4379,7 +4379,7 @@ msgid "unable to close %s after read: %s"
 msgstr ": %s वाचल्यानंतर %s बंद करता येत नाही"
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "%s: %s बंद करता येत नाही"
@@ -4468,7 +4468,7 @@ msgstr ""
 "पॅकेज स्थापनपूर्व/काढल्यानंतर परिभाषेत --पॅकेज व --वळवा निर्धारीत केलेल्या असल्याच पाहिजेत\n"
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, fuzzy, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr "दोन पद्धती निर्धारीत केल्यात: %s आणी --%s"
@@ -4492,13 +4492,13 @@ msgid "package may not contain newlines"
 msgstr "पॅकेज मधे न्युलाइनस् नसेल"
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s साठी  <निर्देशिका> पर्यायाची गरज आहे"
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "अपरिचीत पर्याय `%s'"
@@ -4597,59 +4597,59 @@ msgstr "जुनी नावे `%s': %s स्टॅट करता ये
 msgid "cannot stat new name `%s': %s"
 msgstr "नवी नावे `%s': %s स्टॅट करता येत नाहीत"
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "`%s': %s तपासताना त्रुटी"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, fuzzy, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
 "  different file `%s', not allowed"
 msgstr "पुनर्नामांकनात `%s' वर वेगळ्या फाइल `%s' ने पुनर्लेखन सामील आहे, संमती नाही"
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "पुनर्नामांकन: पुनरावृत्त जुनी साखळी `%s': %s काढून टाका"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "पुनर्नामांकन: `%s' चे `%s': %s मधे पुनर्नामांकन करा"
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "वळण-नवीन: %s बनवा "
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "वळण-नवीन: %s लेखन करा"
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "वळण-नवीन: %s बंद करा"
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "जुने वळण-जुने: %s काढून टाका"
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "नवीन वळण-जुने: %s बनवा"
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "नवीन वळणे: %s अधिष्ठापन करा"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "अंतर्गत त्रुटी: %s भ्रष्ट: %s"
@@ -5178,54 +5178,88 @@ msgstr "आवृत्त्या उपलब्ध नाहीत."
 msgid "Current `best' version is %s."
 msgstr "सद्ध्याची `सर्वात चांगली' आवृत्ती %s आहे."
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
+#, fuzzy, perl-format
+msgid ""
+"warning: %s is supposed to be a symlink to %s, \n"
+"or nonexistent; however, readlink failed: %s"
+msgstr ""
+"धोक्याची सूचना: %s ही %s ची सिमलिंक असणे अपेक्षित\n"
+" (किंवा अस्तित्वात नाही); परंतु, साखळीवाचन फसले: %s"
+
+#: scripts/update-alternatives.pl:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr "%s (%s) ला %s कडे निर्देश केलेल्या स्थितीत सोडत आहे."
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
+msgstr "%s (%s) ला %s कडे निर्देश करण्यासाठी सुधारीत करत आहे."
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr "`%s' पुरवण्याकरिता `%s' वापरत आहे."
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr "%s (%s) काढून टाकत आहे, %s शी सुसंगत नाही."
+
+#: scripts/update-alternatives.pl:288
+#, perl-format
+msgid "unable to remove %s: %s"
+msgstr " %s काढून टाकता येत नाही: %s"
+
+#: scripts/update-alternatives.pl:301
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "अपरिचीत पर्याय `%s'"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--अधिष्ठापा साठी <साखळी> <नाव> <मार्ग> <अग्रक्रम> आवश्यक"
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr "अग्रक्रम हा पूर्णांकच असला पाहिजे"
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s साठी <नाव> <मार्ग> आवश्यक"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s साठी <नाव> आवश्यक"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr "--गुलाम साठी <साखळी> <नाव> <मार्ग> आवश्यक"
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "गुलाम नाव %s ची पुनरावृत्ती"
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "गुलाम साखळी %s ची पुनरावृत्ती"
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "नाव %s हे प्राथमिक व गुलाम दोन्ही"
 
-#: scripts/update-alternatives.pl:293
+#: scripts/update-alternatives.pl:351
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "साखळी %s ही प्राथमिक व गुलाम दोन्ही"
 
-#: scripts/update-alternatives.pl:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5233,31 +5267,21 @@ msgstr ""
 "--दाखवा, --संरचना, --निश्चिती, --अधिष्ठापा, --काढा, --सर्व, --काढा-सर्व, किंवा --"
 "स्वयं गरजेचे"
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr "--गुलाम ला फक्त --अधिष्ठापा सोबत अनुमती"
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "%s साठी विकल्प नाही."
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "%s करिता स्वयंचलित निवड संरचित करत आहे."
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, perl-format
-msgid "unable to remove %s: %s"
-msgstr " %s काढून टाकता येत नाही: %s"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5266,7 +5290,7 @@ msgstr ""
 "%s मधे बदल झाला आहे (तुमच्याकडून किंवा  परिभाषेकडून).\n"
 "फक्त स्वहस्तेच सुधारणा करण्याचे स्विकारत आहे."
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5275,122 +5299,66 @@ msgstr ""
 "%s च्या उपलब्ध आवृत्त्या तपासत आहे, %s ... तील साखळ्यात सुधारणा करत आहे\n"
 "(इच्छा असल्यास तेथील सिमलिंकस् आपण स्वतः बदलू शकता - पहा `मॅन इन'.)"
 
-#: scripts/update-alternatives.pl:392
+#: scripts/update-alternatives.pl:448
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "%s साखळीचे %s मधून %s मधे पुनर्नामांकन करत आहे."
 
-#: scripts/update-alternatives.pl:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "%s चे %s मधे पुनर्नामांकन करता येत नाही: %s"
 
-#: scripts/update-alternatives.pl:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "गुलाम साखळी %s च्या नावाची पुनरावृत्ती"
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "गुलाम साखळी %s चे %s मधून %s मधे पुनर्नामांकन करत आहे."
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:489
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "तुम्ही स्वतःच निवडलेले विकल्प काढून टाकत आहे - स्वयंचलित पद्धती स्विकारत आहे"
 
-#: scripts/update-alternatives.pl:447
+#: scripts/update-alternatives.pl:503
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "%s साठीचा %s विकल्प नोंदणीकृत नाही, काढून टाकत नाही."
 
-#: scripts/update-alternatives.pl:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "कालबाह्य गुलाम साखळी %s (%s) त्यागत आहे."
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "%s च्या स्वयंचलित सुधारणा असमर्थ केलेल्या आहेत, तसेच सोडत आहे."
 
-#: scripts/update-alternatives.pl:497
+#: scripts/update-alternatives.pl:551
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr "स्वयंचलित सुधारणांकडे परत जाण्यासाठी `सुधारा-विकल्प --स्वयं %s' वापरा."
 
-#: scripts/update-alternatives.pl:501
+#: scripts/update-alternatives.pl:555
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "%s ... च्या पूर्वीच्या फसलेल्या सुधारणांतून पूर्वस्थितीवर येत आहे"
 
-#: scripts/update-alternatives.pl:516
+#: scripts/update-alternatives.pl:569
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "लेखनाकरिता %s उघडता येत नाही: %s"
 
-#: scripts/update-alternatives.pl:539
+#: scripts/update-alternatives.pl:592
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "%s (%s) पुरवणारे शेवटचे पॅकेज काढले, ते काढून टाकत आहे."
 
-#: scripts/update-alternatives.pl:553
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a symlink to %s\n"
-" (or nonexistent); however, readlink failed: %s"
-msgstr ""
-"धोक्याची सूचना: %s ही %s ची सिमलिंक असणे अपेक्षित\n"
-" (किंवा अस्तित्वात नाही); परंतु, साखळीवाचन फसले: %s"
-
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr "%s अस्तित्वात नसल्याची खात्री करता येत नाही: %s "
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, perl-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "%s ला %s ची सिमलिंक करता येत नाही: %s"
-
-#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, perl-format
-msgid "unable to install %s as %s: %s"
-msgstr "%s हे %s म्हणून अधिष्टापन करता येत नाही: %s"
-
-#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr "%s (%s) ला %s कडे निर्देश केलेल्या स्थितीत सोडत आहे."
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr "%s (%s) ला %s कडे निर्देश करण्यासाठी सुधारीत करत आहे."
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr "%s (%s) काढून टाकत आहे, %s शी सुसंगत नाही."
-
-#: scripts/update-alternatives.pl:600
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a slave symlink to\n"
-" %s, or nonexistent; however, readlink failed: %s"
-msgstr ""
-"धोक्याची सूचना: %s ही %s ची गुलाम सिमलिंक असणे अपेक्षित\n"
-" (किंवा अस्तित्वात नाही); परंतु, साखळीवाचन फसले: %s"
-
-#: scripts/update-alternatives.pl:634
+#: scripts/update-alternatives.pl:631
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5399,7 +5367,7 @@ msgstr ""
 "%s पुरवणारी फक्त १ आज्ञावली आहे\n"
 "(%s). संरचना करण्यास काहीही नाही.\n"
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5408,7 +5376,7 @@ msgstr ""
 "%s पुरवणारी फक्त १ आज्ञावली आहे\n"
 "(%s). संरचना करण्यास काहीही नाही.\n"
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5421,45 +5389,60 @@ msgstr ""
 "  निवड    विकल्प\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr "डिफॉल्ट[*] ठेवण्यासाठी एंटर दाबा, किंवा निवड अंक टाइप करा: "
 
-#: scripts/update-alternatives.pl:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr "`%s' पुरवण्याकरिता `%s' वापरत आहे."
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "विकल्प `%s' सापडत नाही."
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, fuzzy, perl-format
 msgid "error writing stdout: %s"
 msgstr "एसटीडीआउट लिहीताना त्रुटी"
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "सुधार-विकल्प फायलींमधे न्यूलाइन्स ना मनाई (%s)"
 
-#: scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:696
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "%s करिता %s चे वाचन करताना त्रुटी किंवा इओएफ (%s)"
 
-#: scripts/update-alternatives.pl:736
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "missing newline after %s"
 msgstr "%s नंतर न्यूलाइन गायब"
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, perl-format
+msgid "unable to make %s a symlink to %s: %s"
+msgstr "%s ला %s ची सिमलिंक करता येत नाही: %s"
+
+#: scripts/update-alternatives.pl:715
+#, perl-format
+msgid "unable to install %s as %s: %s"
+msgstr "%s हे %s म्हणून अधिष्टापन करता येत नाही: %s"
+
+#: scripts/update-alternatives.pl:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "गंभीर समस्या: %s"
 
+#~ msgid "unable to ensure %s nonexistent: %s"
+#~ msgstr "%s अस्तित्वात नसल्याची खात्री करता येत नाही: %s "
+
+#~ msgid ""
+#~ "warning: %s is supposed to be a slave symlink to\n"
+#~ " %s, or nonexistent; however, readlink failed: %s"
+#~ msgstr ""
+#~ "धोक्याची सूचना: %s ही %s ची गुलाम सिमलिंक असणे अपेक्षित\n"
+#~ " (किंवा अस्तित्वात नाही); परंतु, साखळीवाचन फसले: %s"
+
 #~ msgid "warning"
 #~ msgstr "धोक्याची सुचना"
 
diff --git a/po/nb.po b/po/nb.po
index b639095f..29fff914 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\n"
 "PO-Revision-Date: 2007-12-26 21:36+0100\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.ui.no>\n"
@@ -262,8 +262,7 @@ msgstr "klarte ikke lukke «%.250s» etter skriving av %s-informasjon"
 #: lib/dump.c:323
 #, c-format
 msgid "failed to link `%.250s' to `%.250s' for backup of %s info"
-msgstr ""
-"klarte ikke lenke «%.250s» til «%.250s» for sikringskopiering av %s-info"
+msgstr "klarte ikke lenke «%.250s» til «%.250s» for sikringskopiering av %s-info"
 
 #: lib/dump.c:326
 #, c-format
@@ -903,26 +902,32 @@ msgstr "feil ved setting av rettigheter for «%.255s»"
 #: src/archives.c:339
 #, c-format
 msgid "failed to stat (dereference) existing symlink `%.250s'"
-msgstr "klarte ikke (stat) finne informasjon om eksisterende symbolske lenke «%.250s»"
+msgstr ""
+"klarte ikke (stat) finne informasjon om eksisterende symbolske lenke «%.250s»"
 
 #: src/archives.c:360
 #, c-format
 msgid ""
 "failed to stat (dereference) proposed new symlink target `%.250s' for "
 "symlink `%.250s'"
-msgstr "klarte ikke (stat) finne informasjon om foreslått nytt symlenke mål «%.250s» for symlenke «%.250s»"
+msgstr ""
+"klarte ikke (stat) finne informasjon om foreslått nytt symlenke mål «%.250s» "
+"for symlenke «%.250s»"
 
 #: src/archives.c:411
 #, c-format
 msgid ""
 "trying to overwrite `%.250s', which is the diverted version of `"
 "%.250s' (package: %.100s)"
-msgstr "prøver å skrive over «%.250s», som er den omdirigerte versjonen av «%.250s» (pakke: %.100s)"
+msgstr ""
+"prøver å skrive over «%.250s», som er den omdirigerte versjonen av "
+"«%.250s» (pakke: %.100s)"
 
 #: src/archives.c:417
 #, c-format
 msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
-msgstr "prøver å skrive over «%.250s», som er den omdirigerte versjonen av «%.250s»"
+msgstr ""
+"prøver å skrive over «%.250s», som er den omdirigerte versjonen av «%.250s»"
 
 #: src/archives.c:440
 #, c-format
@@ -1432,8 +1437,8 @@ msgid ""
 "dpkg: %s: warning - conffile `%.250s' is not a plain file or symlink (= `%"
 "s')\n"
 msgstr ""
-"dpkg: %s: Advarsel - oppsettsfila «%.250s» er ingen vanlig fil eller "
-"symbolsk lenke (= «%s»)\n"
+"dpkg: %s: Advarsel - oppsettsfila «%.250s» er ingen vanlig fil eller symbolsk "
+"lenke (= «%s»)\n"
 
 #: src/configure.c:409
 msgid "md5hash"
@@ -1773,8 +1778,7 @@ msgstr ""
 "De følgende pakkene er bare halvveis installerte, fordi det oppsto\n"
 "problemer under installasjonen. Installasjonen kan sannsynligvis "
 "gjennomføres\n"
-"ved å prøve på nytt. Pakkene kan fjernest med dselect eller «dpkg --"
-"remove»:\n"
+"ved å prøve på nytt. Pakkene kan fjernest med dselect eller «dpkg --remove»:\n"
 
 #: src/enquiry.c:121
 msgid "--audit does not take any arguments"
@@ -1915,8 +1919,8 @@ msgid ""
 "dpkg: serious warning: files list file for package `%.250s' missing, "
 "assuming package has no files currently installed.\n"
 msgstr ""
-"dpkg: Alvorlig advarsel: Fillistefila for pakken «%.250s» mangler, Går ut "
-"fra at pakken ikke har noen filer installert.\n"
+"dpkg: Alvorlig advarsel: Fillistefila for pakken «%.250s» mangler, Går ut fra "
+"at pakken ikke har noen filer installert.\n"
 
 #: src/filesdb.c:145
 #, c-format
@@ -2392,8 +2396,7 @@ msgstr ""
 #: src/main.c:134
 #, c-format
 msgid "Use `dselect' or `aptitude' for user-friendly package management.\n"
-msgstr ""
-"Bruk «dselect» eller «aptitude» for en brukervennlig pakkehåndtering.\n"
+msgstr "Bruk «dselect» eller «aptitude» for en brukervennlig pakkehåndtering.\n"
 
 #: src/main.c:141
 msgid ""
@@ -2886,7 +2889,9 @@ msgstr "fant ikke annen ny fil «%.250s»"
 msgid ""
 "dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
 "%.250s' and `%.250s')\n"
-msgstr "dpkg: Advarsel - den gamle fila «%.250s» er den samme som flere nye filer! (Både «%.250s» og «%.250s».)\n"
+msgstr ""
+"dpkg: Advarsel - den gamle fila «%.250s» er den samme som flere nye filer! "
+"(Både «%.250s» og «%.250s».)\n"
 
 #: src/processarc.c:725
 #, c-format
@@ -3942,7 +3947,8 @@ msgstr ""
 "  --old, --new               Velg arkivformat.\n"
 "  --nocheck                  Ikke sjekk kontrollfil (bygg ugyldig pakke).\n"
 "  -z#                        For å velge komprimering ved bygging.\n"
-"  -Z<type>                   Setter komprimeringstypen som skal brukes ved bygging.\n"
+"  -Z<type>                   Setter komprimeringstypen som skal brukes ved "
+"bygging.\n"
 "                             Tillatte verdier: gzip, bzip2, lzma, ingen.\n"
 "\n"
 
@@ -4021,8 +4027,7 @@ msgstr "fila «%.250s» er ødelagt - ugyldig delnummer"
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of second header"
 msgstr ""
-"fila «%.250s» er ødelagt - ugyldig magisk nummer til slutt i det andre "
-"hovudet"
+"fila «%.250s» er ødelagt - ugyldig magisk nummer til slutt i det andre hovudet"
 
 #: dpkg-split/info.c:147
 #, c-format
@@ -4248,8 +4253,7 @@ msgstr "klarte ikke åpne den nye depotfila «%.250s»"
 #: dpkg-split/queue.c:160
 #, c-format
 msgid "unable to rename new depot file `%.250s' to `%.250s'"
-msgstr ""
-"klarte ikke endre navnet på den nye depotfila fra «%.250s» til «%.250s»"
+msgstr "klarte ikke endre navnet på den nye depotfila fra «%.250s» til «%.250s»"
 
 #: dpkg-split/queue.c:162
 #, c-format
@@ -4438,7 +4442,7 @@ msgid "unable to close %s after read: %s"
 msgstr "klarte ikke lukke %s etter lesing: %s"
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "klarte ikke lukke %s: %s"
@@ -4528,7 +4532,7 @@ msgstr ""
 "Pakke preinst/postrm skript skal alltid oppgi --package og --divert.\n"
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr "to kommandoer oppgitt: %s og --%s"
@@ -4552,13 +4556,13 @@ msgid "package may not contain newlines"
 msgstr "pakke kan ikke  inneholde linjeskift"
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s krever et <katalog> argument"
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "ukjent opsjon «%s»"
@@ -4657,12 +4661,12 @@ msgstr "fant ikke gammelt navn «%s»: %s"
 msgid "cannot stat new name `%s': %s"
 msgstr "fant ikke nytt navn «%s»: %s"
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "feilkontroll «%s»: %s"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4671,47 +4675,47 @@ msgstr ""
 "endring av navn innebærer at «%s» overskrives av\n"
 "  annen fil «%s», ikke tillatt"
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "endre navn: fjerner duplikat gammel lenke «%s»: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "rename: endre navnet på «%s» til «%s»: %s"
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "opprett omdirigeringer-ny: %s"
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "skriv omdirigeringer-ny: %s"
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "lukk omdirigeringer-ny: %s"
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "fjerner gamle omdirigeringer: %s"
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "opprett ny omdirigeringer-gammel: %s"
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "installer nye omdirigeringer: %s"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "intern feil: %s korrupt: %s"
@@ -5151,7 +5155,8 @@ msgstr ""
 "  (f.eks. pager)\n"
 "<sti> er plasseringen av en av de alternative målfilene.\n"
 "  (f.eks. /usr/bin/less)\n"
-"<prioritet> er et heltall; opsjoner med høyere nummer har høyere prioritet i\n"
+"<prioritet> er et heltall; opsjoner med høyere nummer har høyere prioritet "
+"i\n"
 "  automatisk modus.\n"
 "\n"
 "Opsjoner:\n"
@@ -5239,54 +5244,88 @@ msgstr "Ingen versjoner tilgjengelig."
 msgid "Current `best' version is %s."
 msgstr "Nåværende  «beste» versjon er %s."
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
+#, fuzzy, perl-format
+msgid ""
+"warning: %s is supposed to be a symlink to %s, \n"
+"or nonexistent; however, readlink failed: %s"
+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:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr "Forlater %s (%s) pekende til %s."
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
+msgstr "Oppdaterer %s (%s) til å peke til %s."
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr "Bruker «%s» for å tilby «%s»'."
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr "Fjerner %s (%s), siden det ikke passer med %s."
+
+#: scripts/update-alternatives.pl:288
+#, perl-format
+msgid "unable to remove %s: %s"
+msgstr "klarte ikke fjerne %s: %s"
+
+#: scripts/update-alternatives.pl:301
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "ukjent argument «%s»"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install trenger <lenke> <navn> <sti> <prioritet>"
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr "prioritet må være et heltall"
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s krever <navn> <sti>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s krever <navn>"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave trenger <lenke> <navn> <sti>"
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "slave-navn %s duplisert"
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "slave-lenke %s duplisert"
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "navn %s er både primær og slave"
 
-#: scripts/update-alternatives.pl:293
+#: scripts/update-alternatives.pl:351
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "lenke %s er både primær og slave"
 
-#: scripts/update-alternatives.pl:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5294,31 +5333,21 @@ msgstr ""
 "trenger --display, --config, --set, --install, --remove, --all, --remove-all "
 "eller --auto"
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr "--slave bare tillatt med --install"
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Ingen alternativ for %s."
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Setter opp automatisk valg av %s."
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, perl-format
-msgid "unable to remove %s: %s"
-msgstr "klarte ikke fjerne %s: %s"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5327,7 +5356,7 @@ msgstr ""
 "%s har blitt endret (manuelt eller av et skript).\n"
 "Bytter over til kun manuelle oppdateringer."
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5336,124 +5365,68 @@ 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:392
+#: scripts/update-alternatives.pl:448
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Endrer navn på %s lenke fra %s til %s."
 
-#: scripts/update-alternatives.pl:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "klarte ikke endre navn på %s til %s: %s"
 
-#: scripts/update-alternatives.pl:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "slave-lenkenavn %s er duplisert"
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, 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:433
+#: scripts/update-alternatives.pl:489
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "Fjerner manuelt valgte alternativ - bytter til automatisk modus"
 
-#: scripts/update-alternatives.pl:447
+#: scripts/update-alternatives.pl:503
 #, 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:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Kasserer foreldet slavelenke %s (%s)."
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, 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:497
+#: scripts/update-alternatives.pl:551
 #, 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:501
+#: scripts/update-alternatives.pl:555
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Gjenoppretter fra tidligere feilet oppdatering av %s ..."
 
-#: scripts/update-alternatives.pl:516
+#: scripts/update-alternatives.pl:569
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "klarte ikke åpne %s for skriving: %s"
 
-#: scripts/update-alternatives.pl:539
+#: scripts/update-alternatives.pl:592
 #, 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:553
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a symlink to %s\n"
-" (or nonexistent); however, readlink failed: %s"
-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:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr "klarte ikke forsikre at %s ikke eksisterer: %s"
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, 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:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, perl-format
-msgid "unable to install %s as %s: %s"
-msgstr "klarte ikke installere %s som %s: %s"
-
-#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr "Forlater %s (%s) pekende til %s."
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr "Oppdaterer %s (%s) til å peke til %s."
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr "Fjerner %s (%s), siden det ikke passer med %s."
-
-#: scripts/update-alternatives.pl:600
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a slave symlink to\n"
-" %s, or nonexistent; however, readlink failed: %s"
-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:634
+#: scripts/update-alternatives.pl:631
 #, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5462,7 +5435,7 @@ msgstr ""
 "Det er ingen program som tilbyr %s, og\n"
 "dermed ingenting å sette opp.\n"
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5471,7 +5444,7 @@ msgstr ""
 "Det er bare et program som tilbyr %s\n"
 "(%s). Det er ingenting å konfigurere.\n"
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5484,45 +5457,60 @@ msgstr ""
 "  Valg         Alternativ\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 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:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr "Bruker «%s» for å tilby «%s»'."
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Klarte ikke finne alternativ «%s»."
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "feil ved skriving til standard ut: %s"
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "linjeskift forbudt i update-alternatives filer (%s)"
 
-#: scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:696
 #, 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:736
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "missing newline after %s"
 msgstr "mangler linjeskift etter %s"
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, 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:715
+#, perl-format
+msgid "unable to install %s as %s: %s"
+msgstr "klarte ikke installere %s som %s: %s"
+
+#: scripts/update-alternatives.pl:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Alvorlig problem: %s"
 
+#~ msgid "unable to ensure %s nonexistent: %s"
+#~ msgstr "klarte ikke forsikre at %s ikke eksisterer: %s"
+
+#~ msgid ""
+#~ "warning: %s is supposed to be a slave symlink to\n"
+#~ " %s, or nonexistent; however, readlink failed: %s"
+#~ msgstr ""
+#~ "advarsel: %s skal være en slave symbolsk lenke til\n"
+#~ "%s eller ikke-eksisterende; likevel feilet lesing av lenke: %s"
+
 #~ msgid "warning"
 #~ msgstr "advarsel"
 
@@ -5905,8 +5893,7 @@ msgstr "Alvorlig problem: %s"
 #~ "\n"
 #~ "Bruk «dpkg» til å installere og fjerne pakker fra systemet, eller\n"
 #~ "«dselect» eller «aptitude» for brukervennlig pakkehåndtering. Pakker\n"
-#~ "som er pakket ut med «dpkg-deb --extract» vil ikke bli installert "
-#~ "riktig.\n"
+#~ "som er pakket ut med «dpkg-deb --extract» vil ikke bli installert riktig.\n"
 
 #, fuzzy
 #~ msgid ""
diff --git a/po/ne.po b/po/ne.po
index 36408b8e..4b4c0759 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-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\n"
 "PO-Revision-Date: 2007-08-05 17:41+0545\n"
 "Last-Translator: Nabin Gautam <nabin@mpp.org.np>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
@@ -4408,7 +4408,7 @@ msgid "unable to close %s after read: %s"
 msgstr "पढे पछि %s बन्द गर्न अक्षम: %s"
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "%s बन्द गर्न अक्षम: %s"
@@ -4497,7 +4497,7 @@ msgstr ""
 "प्याकेज preinst/postrm स्क्रिप्टले सधै --प्याकेज र --फेराइ निर्दिष्ट गर्नु पर्दछ.\n"
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr "निर्दिष्ट दुइवटा आदेश: %s र --%s"
@@ -4521,13 +4521,13 @@ msgid "package may not contain newlines"
 msgstr "प्याकेजले नयाँरेखा समावेश नगर्न सक्छ"
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s लाई <directory> आवश्यक पर्दछ"
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "अज्ञात विकल्प `%s'"
@@ -4626,12 +4626,12 @@ msgstr "पुरानो नाम `%s' तोक्न सकिदैन: %s
 msgid "cannot stat new name `%s': %s"
 msgstr "नयाँ नाम `%s' तोक्न सकिदैन: %s"
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "जाँच त्रुटि `%s': %s"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4640,47 +4640,47 @@ msgstr ""
 "पुन: नामकरणमा `%s' लाई\n"
 "  फरक फाइल `%s' अधिलेखन समावेश हुन्छ, स्विकार्य छैन"
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "पुन: नामकरण गर्नुहोस्: पुरानो नक्कली लिङ्क `%s' हटाउनुहोस्: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "पुन: नामकरण: `%s' लाई `%s' मा पुन: नामकरण गर्नुहोस्: %s"
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "डाइभर्सन सिर्जना गर्नुहोस्-नयाँ: %s"
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "डाइभर्सन लेख्नुहोस्-नयाँ: %s"
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "डाइभर्सन बन्द गर्नुहोस्-नयाँ: %s"
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "पुरानो डाइभर्सन हटाउनुहोस्-पुरानो: %s"
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "नयाँ डाइभर्सन सिर्जना गर्नुहोस्-पुरानो: %s"
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "नयाँ डाइभर्सन स्थापना गर्नुहोस्: %s"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "आन्तरिक त्रुटि: %s दुषित: %s"
@@ -5205,54 +5205,88 @@ msgstr "संस्करण उपलब्ध छैन"
 msgid "Current `best' version is %s."
 msgstr "हालको उपयुक्त संस्करण %s हो ।"
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
+#, fuzzy, perl-format
+msgid ""
+"warning: %s is supposed to be a symlink to %s, \n"
+"or nonexistent; however, readlink failed: %s"
+msgstr ""
+"चेतावनी: %s लाई %s मा सिमलिङ्क भएको मानिन्छ\n"
+" (वा अवस्थित नरहेको); यद्यपी, रिडलिङ्क असफल: %s"
+
+#: scripts/update-alternatives.pl:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr "%s मा तोक्न %s (%s) छोड्दैछ"
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
+msgstr "%s मा तोक्न %s (%s) अद्यावधिक गर्दैछ"
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr " `%s' प्रदान गर्न `%s' प्रयोग गर्दैछ"
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr "%s (%s) हटाउदैछ, %s सँग उपयुक्त छैन ।"
+
+#: scripts/update-alternatives.pl:288
+#, perl-format
+msgid "unable to remove %s: %s"
+msgstr "%s हटाउन अक्षम: %s"
+
+#: scripts/update-alternatives.pl:301
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "अज्ञात तर्क `%s'"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--स्थापनालाई आवश्यक <link> <name> <path> <priority>"
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr "प्राथमिकता इन्टिजर हुनुपर्दछ"
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s लाई <name> <path> आवश्यक पर्दछ"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s लाई <name> आवश्यक पर्दछ"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr "--स्लेभलाई <link> <name> <path> आवश्यक पर्दछ"
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr " %s स्लेभ नाम  नक्कल गरियो"
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "%s स्लेभ लिङ्क नक्कल गरियो"
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr " %s नाम प्राथमिक र स्लेभ दुबै हो"
 
-#: scripts/update-alternatives.pl:293
+#: scripts/update-alternatives.pl:351
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "%s लिङ्क प्राथमिक र स्लेभ दुबै हो"
 
-#: scripts/update-alternatives.pl:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5260,31 +5294,21 @@ msgstr ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr "--स्लेभ केबल --स्थापनासँग स्विकृत हुन्छ"
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "%s का लागि विकल्प छैन"
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "%s को स्वचालित चयन सेट गर्दैछ"
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, perl-format
-msgid "unable to remove %s: %s"
-msgstr "%s हटाउन अक्षम: %s"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5293,7 +5317,7 @@ msgstr ""
 "%s परिवर्तन गरिएको छ (म्यानुअली वा स्क्रिप्टद्वारा)\n"
 "म्यानुअल अद्यावधिकलाई मात्र स्विचिङ"
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5302,122 +5326,66 @@ msgstr ""
 "%s को उपलब्ध संस्करण जाँच, %s मा लिङ्क अद्याावधिक ...\n"
 "(आवश्यक परेमा तपाईँले सिमलिङ्क परिमार्जन गर्न सक्नुहुन्छ- `man ln' हेर्नुहोस् ।)"
 
-#: scripts/update-alternatives.pl:392
+#: scripts/update-alternatives.pl:448
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "%s बाट %s मा %s लिङ्क पुन: नामकरण"
 
-#: scripts/update-alternatives.pl:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "%s लाई %s मा पुन: नामकरण गर्न अक्षम: %s"
 
-#: scripts/update-alternatives.pl:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "%s स्लेभ लिङ्क नाम नक्कल बनाइयो"
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "%s बाट %s मा स्लेभ लिङ्क %s पुन: नामकरण  "
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:489
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "म्यानुअली चयन गरिएको विकल्प हटाउदैछ - स्वत: मोडमा स्विच गर्दैछ"
 
-#: scripts/update-alternatives.pl:447
+#: scripts/update-alternatives.pl:503
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "%s का लागि %s विकल्प दर्ता गरिएको छैन, हटाइएको छैन ।"
 
-#: scripts/update-alternatives.pl:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "छुटेको स्लेभ लिङ्क %s (%s) परित्याग गर्दैछ"
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr " %s को स्वचालित अद्यावधिक अक्षम पारियो, यसलाई छोड्नुहोस् ।"
 
-#: scripts/update-alternatives.pl:497
+#: scripts/update-alternatives.pl:551
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr "स्वचालित अद्यावधिक फर्काउन अद्यावधिक-विकल्पहरू--स्वत %s' प्रयोग गर्नुहोस् ।"
 
-#: scripts/update-alternatives.pl:501
+#: scripts/update-alternatives.pl:555
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr " %s ...को अघिल्लो असफल अद्यावधिकबाट पुन: प्राप्त गर्दैछ ।"
 
-#: scripts/update-alternatives.pl:516
+#: scripts/update-alternatives.pl:569
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "लेख्नका लागि %s खोल्न अक्षम: %s"
 
-#: scripts/update-alternatives.pl:539
+#: scripts/update-alternatives.pl:592
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "%s (%s) प्रदान गर्ने अन्तिम प्याकेज हटाइयो, यसलाई मेट्दैछ ।"
 
-#: scripts/update-alternatives.pl:553
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a symlink to %s\n"
-" (or nonexistent); however, readlink failed: %s"
-msgstr ""
-"चेतावनी: %s लाई %s मा सिमलिङ्क भएको मानिन्छ\n"
-" (वा अवस्थित नरहेको); यद्यपी, रिडलिङ्क असफल: %s"
-
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr "%s अवस्थित नरहेको यकिन गर्न अक्षम: %s"
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, perl-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "%s मा %s सिमलिङ्क बनाउन अक्षम: %s"
-
-#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, perl-format
-msgid "unable to install %s as %s: %s"
-msgstr "%s को रूपमा %s स्थापना गर्न अक्षम: %s"
-
-#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr "%s मा तोक्न %s (%s) छोड्दैछ"
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr "%s मा तोक्न %s (%s) अद्यावधिक गर्दैछ"
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr "%s (%s) हटाउदैछ, %s सँग उपयुक्त छैन ।"
-
-#: scripts/update-alternatives.pl:600
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a slave symlink to\n"
-" %s, or nonexistent; however, readlink failed: %s"
-msgstr ""
-"चेतावनी : %s लाई\n"
-" %s मा स्लेभ सिमलिङ्क, वा अवस्थित नरहेको मानिन्छ; यद्यपी, रिडलिङ्क असफल भयो: %s"
-
-#: scripts/update-alternatives.pl:634
+#: scripts/update-alternatives.pl:631
 #, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5426,7 +5394,7 @@ msgstr ""
 "त्यहाँ %s उपलब्ध गर्ने कार्यक्रम छैन ।\n"
 "कन्फिगर गर्नलाई केही छैन ।\n"
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5435,7 +5403,7 @@ msgstr ""
 "त्यहाँ %s प्रदान गर्ने केबल १ कार्यक्रम मात्र छ\n"
 "(%s). कन्फिगर गर्न केहि पनि छैन ।\n"
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5448,45 +5416,60 @@ msgstr ""
 "  चयन    विकल्प\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr "पूर्वनिर्धारित [*] राख्न 'प्रविष्ट गर्नुहोस्' थिच्नुहोस्, वा चयन सङ्ख्या टाइप गर्नुहोस्"
 
-#: scripts/update-alternatives.pl:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr " `%s' प्रदान गर्न `%s' प्रयोग गर्दैछ"
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "`%s' विकल्प फेला पार्न सकिदैन ।"
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "stdout लेख्दा त्रुटि: %s"
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "अद्यावधिक-वैकल्पिक फाइलहरू (%s) मा नयाँरेखा निषेधित गरिएको छ"
 
-#: scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:696
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "%s (%s) का लागि त्रुटि वा eof पढाइ %s"
 
-#: scripts/update-alternatives.pl:736
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "missing newline after %s"
 msgstr "%s पछि हराइरहेको नयाँरेखा"
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, perl-format
+msgid "unable to make %s a symlink to %s: %s"
+msgstr "%s मा %s सिमलिङ्क बनाउन अक्षम: %s"
+
+#: scripts/update-alternatives.pl:715
+#, perl-format
+msgid "unable to install %s as %s: %s"
+msgstr "%s को रूपमा %s स्थापना गर्न अक्षम: %s"
+
+#: scripts/update-alternatives.pl:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "गम्भीर समस्या: %s"
 
+#~ msgid "unable to ensure %s nonexistent: %s"
+#~ msgstr "%s अवस्थित नरहेको यकिन गर्न अक्षम: %s"
+
+#~ msgid ""
+#~ "warning: %s is supposed to be a slave symlink to\n"
+#~ " %s, or nonexistent; however, readlink failed: %s"
+#~ msgstr ""
+#~ "चेतावनी : %s लाई\n"
+#~ " %s मा स्लेभ सिमलिङ्क, वा अवस्थित नरहेको मानिन्छ; यद्यपी, रिडलिङ्क असफल भयो: %s"
+
 #~ msgid "warning"
 #~ msgstr "चेतावनी"
 
diff --git a/po/nl.po b/po/nl.po
index abef95f1..9a28f086 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-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\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"
@@ -4488,7 +4488,7 @@ msgid "unable to close %s after read: %s"
 msgstr "kan %s niet sluiten na lezen: %s"
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "kan %s niet sluiten: %s"
@@ -4583,7 +4583,7 @@ msgstr ""
 "geven.\n"
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, fuzzy, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr "twee modes opgegeven: %s en --%s"
@@ -4607,13 +4607,13 @@ msgid "package may not contain newlines"
 msgstr "pakketnaam mag geen regeleinden bevatten"
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s heeft een map als argument nodig"
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "onbekende optie '%s'"
@@ -4712,12 +4712,12 @@ msgstr "kan de status van de oude naam '%s' niet opvragen: %s"
 msgid "cannot stat new name `%s': %s"
 msgstr "kan de status van de nieuwe naam %s niet opvragen: %s"
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "'%s' wordt op fouten gecontroleerd: %s"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4726,47 +4726,47 @@ msgstr ""
 "hernoemen omvat overschrijven van '%s' met\n"
 "  verschillend bestand '%s', niet toegelaten"
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "hernomen: verwijderen van oude dubbele link '%s': %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "hernoemen: '%s' wordt hernoemt naar '%s': %s"
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "diversions-new aanmaken: %s"
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "diversions-new schrijven:  %s"
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "diversions-new afsluiten:  %s"
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "oude diversions-old verwijderen: %s"
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "nieuwe diversions-new aanmaken: %s"
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "nieuwe omleidingen installeren: %s"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "interne fout: %s is corrupt: %s"
@@ -5314,54 +5314,89 @@ msgstr "Geen versies beschikbaar"
 msgid "Current `best' version is %s."
 msgstr "Huidge 'beste' versie is %s."
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
+#, fuzzy, 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"
+" (of onbestaand); echter readlink is mislukt: %s"
+
+#: scripts/update-alternatives.pl:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr "%s (%s) laten we zoals is, verwijzend naar %s."
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
+msgstr "%s (%s) wordt bijgewerkt om naar %s te verwijzen."
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr "'%s' wordt gebruikt om in '%s' te voorzien."
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr "%s (%s) wordt verwijdert, niet toepasselijk met %s."
+
+#: scripts/update-alternatives.pl:288
+#, perl-format
+msgid "unable to remove %s: %s"
+msgstr "verwijderen van %s is mislukt: %s"
+
+#: scripts/update-alternatives.pl:301
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "onbekend argument '%s'"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install heeft <link> <name> <path> <priority> nodig"
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr "prioriteit moet een integer getal zijn"
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s heeft <naam> <pad> nodig"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s heeft <naam> nodig"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave heeft <link> <name> <path> nodig"
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "slaaf-naam %s is gedupliceerd"
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "slaaf-link %s is gedupliceerd"
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "de naam %s is zowel hoofd als slaaf"
 
-#: scripts/update-alternatives.pl:293
+#: scripts/update-alternatives.pl:351
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "de links %s is zowel hoofd als slaaf"
 
-#: scripts/update-alternatives.pl:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5369,31 +5404,21 @@ msgstr ""
 "--display, --config, --set, --install, --remove, --all, --remove-all of --"
 "auto is nodig"
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr "--slave is enkel toegelaten met --install"
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Er zijn geen alternatieven voor %s"
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Automatische selectie van %s wordt opgezet."
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, perl-format
-msgid "unable to remove %s: %s"
-msgstr "verwijderen van %s is mislukt: %s"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5402,7 +5427,7 @@ msgstr ""
 "%s is veranderd (handmatig of door een script).\n"
 "Er wordt omgeschakeld naar enkel handmatige updates."
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5412,130 +5437,73 @@ msgstr ""
 "bijgewerkt ...\n"
 "(U kunt de symbolische koppelingen desgewenst zelf wijzigen - zie 'man ln'.)"
 
-#: scripts/update-alternatives.pl:392
+#: scripts/update-alternatives.pl:448
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "%s-link wordt hernoemt van %s naar %s."
 
-#: scripts/update-alternatives.pl:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "kan %s niet hernoemen naar %s: %s"
 
-#: scripts/update-alternatives.pl:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "slaaf-linknaam %s is dubbel"
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, 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:433
+#: scripts/update-alternatives.pl:489
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 "Handmatig geselecteerd alternatief wordt verwijderd - wordt omgeschakeld "
 "naar automatische modus"
 
-#: scripts/update-alternatives.pl:447
+#: scripts/update-alternatives.pl:503
 #, 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:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Verouderde slaaf-link %s wordt weggegooid (%s)."
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr ""
 "Automatische opwaarderingen van %s zijn uitgeschakeld, het wordt met rust "
 "gelaten."
 
-#: scripts/update-alternatives.pl:497
+#: scripts/update-alternatives.pl:551
 #, 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."
 
-#: scripts/update-alternatives.pl:501
+#: scripts/update-alternatives.pl:555
 #, 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:516
+#: scripts/update-alternatives.pl:569
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "kan %s niet openen voor schrijven: %s"
 
-#: scripts/update-alternatives.pl:539
+#: scripts/update-alternatives.pl:592
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr ""
 "Laatste pakket dat voorzag in %s (%s) is verwijderd, dit wordt verwijderd. "
 
-#: scripts/update-alternatives.pl:553
-#, 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"
-" (of onbestaand); echter readlink is mislukt: %s"
-
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr "kan niet verzekeren dat %s niet bestaat: %s"
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, 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:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, perl-format
-msgid "unable to install %s as %s: %s"
-msgstr "kan %s niet installeren als %s: %s"
-
-#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr "%s (%s) laten we zoals is, verwijzend naar %s."
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr "%s (%s) wordt bijgewerkt om naar %s te verwijzen."
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr "%s (%s) wordt verwijdert, niet toepasselijk met %s."
-
-#: scripts/update-alternatives.pl:600
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a slave symlink to\n"
-" %s, or nonexistent; however, readlink failed: %s"
-msgstr ""
-"waarschuwing: %s wordt verondersteld een slaaf-link te zijn voor\n"
-" %s, of onbestaand; echter readlink is mislukt: %s"
-
-#: scripts/update-alternatives.pl:634
+#: scripts/update-alternatives.pl:631
 #, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5544,7 +5512,7 @@ msgstr ""
 "Er is geen programma dat %s voorziet\n"
 "Er is niets in te stellen.\n"
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5553,7 +5521,7 @@ msgstr ""
 "Er is slechts 1 programma dat %s voorziet\n"
 "(%s). Er is niets in te stellen.\n"
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5566,48 +5534,63 @@ msgstr ""
 "  Selectie    Alternatieven\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 "druk enter om de standaardwaarde [*] te behouden, of  geef het "
 "selectienumber in: "
 
-#: scripts/update-alternatives.pl:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr "'%s' wordt gebruikt om in '%s' te voorzien."
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Kan geen alternatief '%s' vinden."
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "fout bij schrijven naar stdout: %s"
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 "regeleinden zijn niet toegelaten in 'update-alternatives'-bestanden (%s)"
 
-#: scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:696
 #, 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:736
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "missing newline after %s"
 msgstr "missend regeleinde na %s"
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, 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:715
+#, perl-format
+msgid "unable to install %s as %s: %s"
+msgstr "kan %s niet installeren als %s: %s"
+
+#: scripts/update-alternatives.pl:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Ernstig probleem: %s"
 
+#~ msgid "unable to ensure %s nonexistent: %s"
+#~ msgstr "kan niet verzekeren dat %s niet bestaat: %s"
+
+#~ msgid ""
+#~ "warning: %s is supposed to be a slave symlink to\n"
+#~ " %s, or nonexistent; however, readlink failed: %s"
+#~ msgstr ""
+#~ "waarschuwing: %s wordt verondersteld een slaaf-link te zijn voor\n"
+#~ " %s, of onbestaand; echter readlink is mislukt: %s"
+
 #~ msgid "warning"
 #~ msgstr "waarschuwing"
 
diff --git a/po/nn.po b/po/nn.po
index a389126f..1788d6c3 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-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\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"
@@ -753,8 +753,7 @@ msgstr ""
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr ""
-"MSDOS-teikn for slutt på fil i verdien for feltet «%.*s» (manglar "
-"linjeskift?)"
+"MSDOS-teikn for slutt på fil i verdien for feltet «%.*s» (manglar linjeskift?)"
 
 #: lib/parse.c:188
 #, c-format
@@ -978,8 +977,8 @@ msgstr "Bytta ut med filer i den installerte pakken %s ...\n"
 msgid ""
 "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
 msgstr ""
-"prøver å skriva over katalogen «%.250s» i pakken %.250s med noko anna enn "
-"ein katalog"
+"prøver å skriva over katalogen «%.250s» i pakken %.250s med noko anna enn ein "
+"katalog"
 
 #: src/archives.c:568
 #, c-format
@@ -1416,8 +1415,7 @@ msgid ""
 "dpkg: %s: warning - config file `%s' is a circular link\n"
 " (= `%s')\n"
 msgstr ""
-"dpkg: %s: Åtvaring - oppsettsfila «%s» er ei lenkje som peikar til seg "
-"sjølv\n"
+"dpkg: %s: Åtvaring - oppsettsfila «%s» er ei lenkje som peikar til seg sjølv\n"
 " (= «%s»)\n"
 
 #: src/configure.c:358
@@ -1788,8 +1786,7 @@ msgstr ""
 "Dei følgjande pakkane er berre halvvegs installerte, fordi det oppstod\n"
 "problem under installasjonen. Installasjonen kan sannsynlegvis "
 "gjennomførast\n"
-"ved å prøva på nytt. Pakkane kan fjernast med dselect eller «dpkg --"
-"remove»:\n"
+"ved å prøva på nytt. Pakkane kan fjernast med dselect eller «dpkg --remove»:\n"
 
 #: src/enquiry.c:121
 msgid "--audit does not take any arguments"
@@ -1931,8 +1928,8 @@ msgid ""
 "dpkg: serious warning: files list file for package `%.250s' missing, "
 "assuming package has no files currently installed.\n"
 msgstr ""
-"dpkg: Alvorleg åtvaring: Fillistefila for pakken «%.250s» manglar. Går ut "
-"frå at pakken ikkje har nokon filer installert.\n"
+"dpkg: Alvorleg åtvaring: Fillistefila for pakken «%.250s» manglar. Går ut frå "
+"at pakken ikkje har nokon filer installert.\n"
 
 #: src/filesdb.c:145
 #, c-format
@@ -3171,8 +3168,8 @@ msgid ""
 "dpkg - warning: while removing %.250s, directory `%.250s' not empty so not "
 "removed.\n"
 msgstr ""
-"dpkg - åtvaring: Ved fjerning av %.250s var katalogen «%.250s» ikkje tom. "
-"Han vart difor ikkje fjerna.\n"
+"dpkg - åtvaring: Ved fjerning av %.250s var katalogen «%.250s» ikkje tom. Han "
+"vart difor ikkje fjerna.\n"
 
 #: src/remove.c:405
 #, c-format
@@ -3373,8 +3370,8 @@ msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
 "<=0775)"
 msgstr ""
-"vedlikehaldarskriptet «%.50s» har feil tilgangsløyve %03lo (må vera >=0555 "
-"og <=0775)"
+"vedlikehaldarskriptet «%.50s» har feil tilgangsløyve %03lo (må vera >=0555 og "
+"<=0775)"
 
 #: dpkg-deb/build.c:291
 #, c-format
@@ -3766,8 +3763,7 @@ msgstr "dpkg-deb: «%.255s» inneheld ikkje kontrollkomponenten «%.255s»\n"
 #: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
-msgstr ""
-"opning av komponenten «%.255s» (i %.255s) mislukkast på ein uventa måte"
+msgstr "opning av komponenten «%.255s» (i %.255s) mislukkast på ein uventa måte"
 
 #: dpkg-deb/info.c:120
 msgid "One requested control component is missing"
@@ -3929,8 +3925,7 @@ msgstr "fila «%.250s» er øydelagd - nullar i informasjonsdelen"
 #: dpkg-split/info.c:116
 #, c-format
 msgid "file `%.250s' is format version `%.250s' - you need a newer dpkg-split"
-msgstr ""
-"fila «%.250s» har formatversjon «%.250s» - du treng ein nyare dpkg-split"
+msgstr "fila «%.250s» har formatversjon «%.250s» - du treng ein nyare dpkg-split"
 
 #: dpkg-split/info.c:124
 #, c-format
@@ -3957,8 +3952,7 @@ msgstr ""
 #: dpkg-split/info.c:147
 #, c-format
 msgid "file `%.250s' is corrupt - second member is not data member"
-msgstr ""
-"fila «%.250s» er øydelagd - den andre medlemmen er ikkje ein datamedlem"
+msgstr "fila «%.250s» er øydelagd - den andre medlemmen er ikkje ein datamedlem"
 
 #: dpkg-split/info.c:153
 #, c-format
@@ -4166,8 +4160,7 @@ msgstr "klarte ikkje opna den nye depotfila «%.250s»"
 #: dpkg-split/queue.c:160
 #, c-format
 msgid "unable to rename new depot file `%.250s' to `%.250s'"
-msgstr ""
-"klarte ikkje endra namnet på den nye depotfila frå «%.250s» til «%.250s»"
+msgstr "klarte ikkje endra namnet på den nye depotfila frå «%.250s» til «%.250s»"
 
 #: dpkg-split/queue.c:162
 #, c-format
@@ -4347,7 +4340,7 @@ msgid "unable to close %s after read: %s"
 msgstr "klarte ikkje lukka etter lesing: «%.255s»"
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, fuzzy, perl-format
 msgid "unable to close %s: %s"
 msgstr "klarte ikkje køyra %s"
@@ -4410,7 +4403,7 @@ msgid ""
 msgstr ""
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr ""
@@ -4435,13 +4428,13 @@ msgid "package may not contain newlines"
 msgstr "Pakken «%s» inneheld ingen filer (!)\n"
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, fuzzy, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--build krev ein katalogparameter"
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, fuzzy, perl-format
 msgid "unknown option `%s'"
 msgstr "ukjent val --%s"
@@ -4537,60 +4530,60 @@ msgstr "fann ikkje «%.255s» (i «%.255s»)"
 msgid "cannot stat new name `%s': %s"
 msgstr "fann ikkje «%.255s» (i «%.255s»)"
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, fuzzy, perl-format
 msgid "error checking `%s': %s"
 msgstr "feil ved skriving av «%s»"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
 "  different file `%s', not allowed"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, fuzzy, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr ""
 "dpkg: %s: Åtvaring - klarte ikkje endra namnet på «%.250s» til «%.250s»: %s\n"
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, fuzzy, perl-format
 msgid "create diversions-new: %s"
 msgstr "lesefeil i omdirigeringsfila [i]"
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, fuzzy, perl-format
 msgid "write diversions-new: %s"
 msgstr "omdirigert med %s"
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, fuzzy, perl-format
 msgid "close diversions-new: %s"
 msgstr "omdirigert med %s"
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, fuzzy, perl-format
 msgid "create new diversions-old: %s"
 msgstr "lesefeil i omdirigeringsfila [i]"
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, fuzzy, perl-format
 msgid "install new diversions: %s"
 msgstr "klarte ikkje installera ny versjon av «%.255s»"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, fuzzy, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "%s: Intern gzip-feil: Skreiv: «%s»"
@@ -5036,223 +5029,193 @@ msgstr "(inga skildring tilgjengeleg)"
 msgid "Current `best' version is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
+#, 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:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr ""
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
+msgstr ""
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr "%s (underprosess): %s\n"
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr ""
+
+#: scripts/update-alternatives.pl:288
+#, fuzzy, perl-format
+msgid "unable to remove %s: %s"
+msgstr "klarte ikkje køyra %s"
+
+#: scripts/update-alternatives.pl:301
 #, fuzzy, perl-format
 msgid "unknown argument `%s'"
 msgstr "ukjend komprimeringstype «%s»!"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr ""
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, fuzzy, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s krev eit .deb-filnamn som parameter"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, fuzzy, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s tek ingen parametrar"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:293
+#: scripts/update-alternatives.pl:351
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
 msgstr ""
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr ""
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, fuzzy, perl-format
-msgid "unable to remove %s: %s"
-msgstr "klarte ikkje køyra %s"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
 "Switching to manual updates only."
 msgstr ""
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, 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:392
+#: scripts/update-alternatives.pl:448
 #, fuzzy, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Pakkar ut %s (frå %s) ...\n"
 
-#: scripts/update-alternatives.pl:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, fuzzy, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "finn ikkje %s «%.250s»"
 
-#: scripts/update-alternatives.pl:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:489
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 
-#: scripts/update-alternatives.pl:447
+#: scripts/update-alternatives.pl:503
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: scripts/update-alternatives.pl:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr ""
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr ""
 
-#: scripts/update-alternatives.pl:497
+#: scripts/update-alternatives.pl:551
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:501
+#: scripts/update-alternatives.pl:555
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr ""
 
-#: scripts/update-alternatives.pl:516
+#: scripts/update-alternatives.pl:569
 #, fuzzy, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "klarte ikkje opna kjeldefila «%.250s»"
 
-#: scripts/update-alternatives.pl:539
+#: scripts/update-alternatives.pl:592
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr ""
 
-#: scripts/update-alternatives.pl:553
-#, 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:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, fuzzy, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr "klarte ikkje køyra nytt %s"
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, 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:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, fuzzy, perl-format
-msgid "unable to install %s as %s: %s"
-msgstr "klarte ikkje installera «%.250s» som «%.250s»"
-
-#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr ""
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr ""
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr ""
-
-#: scripts/update-alternatives.pl:600
-#, 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:634
+#: scripts/update-alternatives.pl:631
 #, 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:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
 "(%s). Nothing to configure.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5261,45 +5224,54 @@ msgid ""
 "-----------------------------------------------\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 
-#: scripts/update-alternatives.pl:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr ""
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, fuzzy, perl-format
 msgid "error writing stdout: %s"
 msgstr "feil ved skriving av «%s»"
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:696
 #, fuzzy, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "klarte ikkje lesa %s frå %.255s"
 
-#: scripts/update-alternatives.pl:736
+#: scripts/update-alternatives.pl:698
 #, fuzzy, perl-format
 msgid "missing newline after %s"
 msgstr "fila «%.250s» er øydelagd - manglar linjeskift etter %.250s"
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, 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:715
+#, fuzzy, perl-format
+msgid "unable to install %s as %s: %s"
+msgstr "klarte ikkje installera «%.250s» som «%.250s»"
+
+#: scripts/update-alternatives.pl:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr ""
 
+#, fuzzy
+#~ msgid "unable to ensure %s nonexistent: %s"
+#~ msgstr "klarte ikkje køyra nytt %s"
+
 #~ msgid "warning"
 #~ msgstr "Ã¥tvaring"
 
diff --git a/po/pa.po b/po/pa.po
index 7d4f61e1..49c720dc 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-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\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"
@@ -4210,7 +4210,7 @@ msgid "unable to close %s after read: %s"
 msgstr ""
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr ""
@@ -4301,7 +4301,7 @@ msgstr ""
 "divert.\n"
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr ""
@@ -4325,13 +4325,13 @@ msgid "package may not contain newlines"
 msgstr ""
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr ""
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "ਅਣਜਾਣ ਚੋਣ `%s'"
@@ -4424,59 +4424,59 @@ msgstr ""
 msgid "cannot stat new name `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "`%s' ਜਾਂਚ ਦੌਰਾਨ ਗਲਤੀ: %s"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
 "  different file `%s', not allowed"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, perl-format
 msgid "install new diversions: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "ਅੰਦਰੂਨੀ ਗਲਤੀ: %s ਨਿਕਾਰਾ: %s"
@@ -5000,54 +5000,86 @@ msgstr "ਕੋਈ ਵਰਜਨ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
 msgid "Current `best' version is %s."
 msgstr "%s ਦਾ ਮੌਜੂਦਾ`best' ਵਰਜਨ ਹੈ।"
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
+#, 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:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr ""
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
+msgstr ""
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr "  %.250s %s ਹੈ।\n"
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr ""
+
+#: scripts/update-alternatives.pl:288
+#, perl-format
+msgid "unable to remove %s: %s"
+msgstr "%s ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ: %s"
+
+#: scripts/update-alternatives.pl:301
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "ਲਾਜ਼ਮੀ ਮੁੱਲ `%s'"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install needs <link> <name> <path> <priority>"
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr "ਤਰਜੀਹ ਇੱਕ ਪੂਰਨ ਅੰਕ ਹੀ ਚਾਹੀਦਾ ਹੈ"
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s needs <name> <path>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s needs <name>"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave needs <link> <name> <path>"
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:293
+#: scripts/update-alternatives.pl:351
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5055,170 +5087,108 @@ msgstr ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr "--slave only allowed with --install"
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "%s ਲਈ ਕੋਈ ਬਦਲ ਨਹੀਂ ਹੈ।"
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "%s ਲਈ ਆਟੋਮੈਟਿਕ ਚੋਣ ਸੈਟਅੱਪ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, perl-format
-msgid "unable to remove %s: %s"
-msgstr "%s ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ: %s"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
 "Switching to manual updates only."
 msgstr ""
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, 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:392
+#: scripts/update-alternatives.pl:448
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:489
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 
-#: scripts/update-alternatives.pl:447
+#: scripts/update-alternatives.pl:503
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: scripts/update-alternatives.pl:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr ""
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "%s ਲਈ ਆਟੋਮੈਟਿਕ ਅੱਪਡੇਟ ਆਯੋਗ ਹੈ, ਇਸ ਨੂੰ ਇੱਕਲਾ ਛੱਡਿਆ ਜਾਂਦਾ ਹੈ"
 
-#: scripts/update-alternatives.pl:497
+#: scripts/update-alternatives.pl:551
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:501
+#: scripts/update-alternatives.pl:555
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr ""
 
-#: scripts/update-alternatives.pl:516
+#: scripts/update-alternatives.pl:569
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:539
+#: scripts/update-alternatives.pl:592
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr ""
 
-#: scripts/update-alternatives.pl:553
-#, 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:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr ""
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, perl-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr ""
-
-#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, perl-format
-msgid "unable to install %s as %s: %s"
-msgstr ""
-
-#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr ""
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr ""
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr ""
-
-#: scripts/update-alternatives.pl:600
-#, 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:634
+#: scripts/update-alternatives.pl:631
 #, perl-format
 msgid ""
 "There is no program which provides %s.\n"
 "Nothing to configure.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
 "(%s). Nothing to configure.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5227,41 +5197,46 @@ msgid ""
 "-----------------------------------------------\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 
-#: scripts/update-alternatives.pl:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr ""
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:696
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:736
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "missing newline after %s"
 msgstr "ਨਵੀਂ-ਲਾਇਨ %s ਬਾਅਦ ਮੌਜੂਦ ਨਹੀਂ"
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, perl-format
+msgid "unable to make %s a symlink to %s: %s"
+msgstr ""
+
+#: scripts/update-alternatives.pl:715
+#, perl-format
+msgid "unable to install %s as %s: %s"
+msgstr ""
+
+#: scripts/update-alternatives.pl:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "ਗੰਭੀਰ ਸਮੱਸਿਆ: %s"
diff --git a/po/pl.po b/po/pl.po
index 2bbac7b6..9a4ac8b6 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14.17\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\n"
 "PO-Revision-Date: 2007-10-08 22:30+0200\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <pddp@debian.linux.org.pl>\n"
@@ -4496,7 +4496,7 @@ msgid "unable to close %s after read: %s"
 msgstr "nie mo¿na zamkn±æ %s po czytaniu: %s"
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "nie mo¿na zamkn±æ %s: %s"
@@ -4587,7 +4587,7 @@ msgstr ""
 "Skrypty przed/poinstalacyjne musz± zawsze podawaæ --package i --divert.\n"
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr "podano dwa polecenia: %s i --%s"
@@ -4611,13 +4611,13 @@ msgid "package may not contain newlines"
 msgstr "pakiet nie mo¿e zawieraæ znaków nowej linii"
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s wymaga argumentu <katalog>"
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "nieznana opcja `%s'"
@@ -4716,12 +4716,12 @@ msgstr "nie mo
 msgid "cannot stat new name `%s': %s"
 msgstr "nie mo¿na pobraæ statusu nowego pliku `%s' : %s"
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "b³±d sprawdzania `%s': %s"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4730,47 +4730,47 @@ msgstr ""
 "zmiana nazwy oznacza nadpisanie `%s' \n"
 "  innym plikiem `%s', co nie jest dozwolone"
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "rename: usuwanie podwójnego starego dowi±zania `%s': %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "rename: zmienianie nazwy `%s' na `%s': %s"
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "tworzenie pliku diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "zapisywanie pliku diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "zamykanie pliku diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "usuwanie starego pliku diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "czytanie nowego pliku diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "instalowanie nowej listy ominiêæ: %s"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "b³±d wewnêtrzny: uszkodzone %s: %s"
@@ -5297,54 +5297,88 @@ msgstr "
 msgid "Current `best' version is %s."
 msgstr "Obecnie `najlepsz±' wersj± jest %s."
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
+#, fuzzy, perl-format
+msgid ""
+"warning: %s is supposed to be a symlink to %s, \n"
+"or nonexistent; however, readlink failed: %s"
+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:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr "Zostawianie %s (%s) wskazuj±cego na %s."
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
+msgstr "Aktualizowanie %s (%s), ¿eby wskazywa³ na %s."
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr "U¿ywanie `%s' jako dostarczaj±cego `%s'."
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr "Usuwanie %s (%s), nie odpowiednie dla %s."
+
+#: scripts/update-alternatives.pl:288
+#, perl-format
+msgid "unable to remove %s: %s"
+msgstr "nie mo¿na usun±æ %s: %s"
+
+#: scripts/update-alternatives.pl:301
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "nieznany argument `%s'"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install wymaga podania <linku> <nazwy> <¶cie¿ki> <priorytetu>"
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr "priorytet musi byæ liczb±"
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s wymaga argumentów <nazwa> <¶cie¿ka>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s wymaga <nazwy>"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave wymaga <linku> <nazwy> <¶cie¿ki>"
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "podwojona nazwa podrzêdna %s"
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "podwojone dowi±zanie podrzêdne %s"
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, 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:293
+#: scripts/update-alternatives.pl:351
 #, 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:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5352,31 +5386,21 @@ msgstr ""
 "nale¿y podaæ --display, --config, --set, --install, --remove, --all, --"
 "remove-all lub --auto"
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr "--slave dopuszczalna tylko z --install"
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Brak alternatyw dla %s."
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Ustawianie automatycznego wybierania %s"
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, perl-format
-msgid "unable to remove %s: %s"
-msgstr "nie mo¿na usun±æ %s: %s"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5385,7 +5409,7 @@ msgstr ""
 "%s zosta³ zmieniony (rêcznie lub przez skrypt).\n"
 "Prze³±czanie do trybu rêcznych aktualizacji."
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5395,124 +5419,68 @@ msgstr ""
 "(Mo¿esz zmieniæ dowi±zania symboliczne samemu, je¶li chcesz - patrz `man "
 "ln')."
 
-#: scripts/update-alternatives.pl:392
+#: scripts/update-alternatives.pl:448
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Zmienianie nazwy dowi±zaniu %s z %s na %s."
 
-#: scripts/update-alternatives.pl:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "nie mo¿na zmieniæ nazwy %s na %s: %s"
 
-#: scripts/update-alternatives.pl:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "podwojona nazwa dowi±zania podrzêdnego %s"
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, 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:433
+#: scripts/update-alternatives.pl:489
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "Usuwanie alternatywy wybranej rêcznie - prze³±czanie do trybu auto"
 
-#: scripts/update-alternatives.pl:447
+#: scripts/update-alternatives.pl:503
 #, 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:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Wyrzucanie przestarza³ego dowi±zania podrzêdnego %s (%s)"
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, 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:497
+#: scripts/update-alternatives.pl:551
 #, 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:501
+#: scripts/update-alternatives.pl:555
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Odtwarzanie z poprzedniej nieudanej aktualizacji %s ..."
 
-#: scripts/update-alternatives.pl:516
+#: scripts/update-alternatives.pl:569
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "nie mo¿na otworzyæ %s do zapisu: %s"
 
-#: scripts/update-alternatives.pl:539
+#: scripts/update-alternatives.pl:592
 #, 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:553
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a symlink to %s\n"
-" (or nonexistent); however, readlink failed: %s"
-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:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr "nie mo¿na usun±æ %s: %s"
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, 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:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, perl-format
-msgid "unable to install %s as %s: %s"
-msgstr "nie mo¿na zainstalowaæ %s jako %s: %s"
-
-#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr "Zostawianie %s (%s) wskazuj±cego na %s."
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr "Aktualizowanie %s (%s), ¿eby wskazywa³ na %s."
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr "Usuwanie %s (%s), nie odpowiednie dla %s."
-
-#: scripts/update-alternatives.pl:600
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a slave symlink to\n"
-" %s, or nonexistent; however, readlink failed: %s"
-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:634
+#: scripts/update-alternatives.pl:631
 #, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5521,7 +5489,7 @@ msgstr ""
 "Nie znaleziono programu, który dostarcza %s.\n"
 "Nie ma nic do konfigurowania.\n"
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5530,7 +5498,7 @@ msgstr ""
 "Jest tylko jeden program, który dostarcza %s\n"
 "(%s). Nie ma nic do konfigurowania.\n"
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5543,42 +5511,57 @@ msgstr ""
 "  Wybór        Alternatywa\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 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:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr "U¿ywanie `%s' jako dostarczaj±cego `%s'."
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Nie mo¿na znale¼æ alternatywy `%s'."
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "b³±d zapisu na standardowe wyj¶cie: %s"
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, 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:735
+#: scripts/update-alternatives.pl:696
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "nie mo¿na odczytaæ %s dla %s (%s)"
 
-#: scripts/update-alternatives.pl:736
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "missing newline after %s"
 msgstr "brakuj±cy znak nowej linii po %s"
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, 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:715
+#, perl-format
+msgid "unable to install %s as %s: %s"
+msgstr "nie mo¿na zainstalowaæ %s jako %s: %s"
+
+#: scripts/update-alternatives.pl:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Powa¿ny problem: %s"
+
+#~ msgid "unable to ensure %s nonexistent: %s"
+#~ msgstr "nie mo¿na usun±æ %s: %s"
+
+#~ msgid ""
+#~ "warning: %s is supposed to be a slave symlink to\n"
+#~ " %s, or nonexistent; however, readlink failed: %s"
+#~ msgstr ""
+#~ "ostrze¿enie: %s powinien byæ pobocznym dowi±zaniem do\n"
+#~ " %s lub nie powinien istnieæ; jednak¿e readlink zwróci³ b³±d: %s"
diff --git a/po/pt.po b/po/pt.po
index a8f3fb11..b46c05fe 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-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\n"
 "PO-Revision-Date: 2007-09-06 21:55+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -4527,7 +4527,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:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "não foi possível fechar %s: %s"
@@ -4620,7 +4620,7 @@ msgstr ""
 "divert.\n"
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr "dois comandos específicados: %s e --%s"
@@ -4644,13 +4644,13 @@ msgid "package may not contain newlines"
 msgstr "o pacote não pode conter novas linhas"
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s necessita de um argumento <directório>"
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "opção desconhecida `%s'"
@@ -4749,12 +4749,12 @@ msgstr "Não pode fazer stat ao nome antigo `%s': %s"
 msgid "cannot stat new name `%s': %s"
 msgstr "Não pode fazer stat ao novo nome `%s': %s"
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "erro ao verificar `%s':·%s"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4763,47 +4763,47 @@ msgstr ""
 "renomear envolve sobre-escrever `%s' com\n"
 "  um ficheiro diferente `%s', não permitido"
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "renomear: remove o link antigo duplicado `%s':·%s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "renomear: renomear `%s' para `%s': %s"
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "criar diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "escrever diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "fechar diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "remover diversions-old antigo: %s"
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "criar novo diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "instalar novos desvios: %s"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "erro interno: %s corrompido: %s"
@@ -5344,54 +5344,88 @@ msgstr "Sem versões disponíveis."
 msgid "Current `best' version is %s."
 msgstr "A `melhor' versão corrente é %s."
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
+#, fuzzy, perl-format
+msgid ""
+"warning: %s is supposed to be a symlink to %s, \n"
+"or nonexistent; however, readlink failed: %s"
+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:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr "A deixar %s (%s) a apontar para %s."
+
+#: scripts/update-alternatives.pl:247
+#, 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:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr "A usar `%s' para fornecer `%s'."
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr "A remover %s (%s), não apropriado com %s."
+
+#: scripts/update-alternatives.pl:288
+#, perl-format
+msgid "unable to remove %s: %s"
+msgstr "não foi possível remover %s: %s"
+
+#: scripts/update-alternatives.pl:301
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "argumento desconhecido `%s'"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install necessita de <link> <nome> <caminho> <prioridade>"
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr "a prioridade tem de ser um inteiro"
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s necessita de <nome> <caminho>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s necessita de <nome>"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave necessita de <link> <nome> <caminho>"
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "o nome do slave %s está duplicado"
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "o link do slave %s está duplicado"
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "o nome %s é primário e slave"
 
-#: scripts/update-alternatives.pl:293
+#: scripts/update-alternatives.pl:351
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "o link %s é primário e slave"
 
-#: scripts/update-alternatives.pl:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5399,31 +5433,21 @@ msgstr ""
 "necessita de --display, --config, --set, --install, --remove, --all--remove-"
 "all ou --auto"
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr "--slave apenas é permito com --install"
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Sem alternativas para %s."
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "A configurar a selecção automática de %s."
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, perl-format
-msgid "unable to remove %s: %s"
-msgstr "não foi possível remover %s: %s"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5432,7 +5456,7 @@ msgstr ""
 "%s foi alterado (manualmente ou por um script).\n"
 "A passar para actualizações manuais apenas."
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5441,126 +5465,70 @@ 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:392
+#: scripts/update-alternatives.pl:448
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "A renomear o link %s de %s para %s."
 
-#: scripts/update-alternatives.pl:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, 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:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "nome de link slave %s duplicado"
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, 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:433
+#: scripts/update-alternatives.pl:489
 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:447
+#: scripts/update-alternatives.pl:503
 #, 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:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "A descartar links slave obsoletos %s (%s)."
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "Actualizações automáticas de %s estão desactivadas, abandonando."
 
-#: scripts/update-alternatives.pl:497
+#: scripts/update-alternatives.pl:551
 #, 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:501
+#: scripts/update-alternatives.pl:555
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "A recuperar da actualização anterior falhada de %s·..."
 
-#: scripts/update-alternatives.pl:516
+#: scripts/update-alternatives.pl:569
 #, 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:539
+#: scripts/update-alternatives.pl:592
 #, 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:553
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a symlink to %s\n"
-" (or nonexistent); however, readlink failed: %s"
-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:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, 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:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, 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:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, 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:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr "A deixar %s (%s) a apontar para %s."
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, 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:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr "A remover %s (%s), não apropriado com %s."
-
-#: scripts/update-alternatives.pl:600
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a slave symlink to\n"
-" %s, or nonexistent; however, readlink failed: %s"
-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:634
+#: scripts/update-alternatives.pl:631
 #, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5569,7 +5537,7 @@ msgstr ""
 "Existe apenas um programa que disponibiliza %s.\n"
 "Nada para configurar.\n"
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5578,7 +5546,7 @@ msgstr ""
 "Existe apenas um programa que fornece %s\n"
 "(%s). Nada para configurar.\n"
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5591,46 +5559,61 @@ msgstr ""
 "  Selecção    Alternativa\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 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:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr "A usar `%s' para fornecer `%s'."
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Impossível encontrar alternativa `%s'."
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "erro ao escrever stdout: %s"
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "newlines proibidas em ficheiros update-alternatives (%s)"
 
-#: scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:696
 #, 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:736
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "missing newline after %s"
 msgstr "falta nova linha após %s"
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, 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:715
+#, 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:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Problema sério: %s"
 
+#~ msgid "unable to ensure %s nonexistent: %s"
+#~ msgstr "impossível averiguar a não existência de %s: %s"
+
+#~ msgid ""
+#~ "warning: %s is supposed to be a slave symlink to\n"
+#~ " %s, or nonexistent; however, readlink failed: %s"
+#~ msgstr ""
+#~ "aviso:·%s·é·suposto·ser·um·link·simbólico·slave para·\n"
+#~ " %s (ou não-existente);·no·entanto,·a·sua·leitura·falhou:·%s"
+
 #~ msgid "warning"
 #~ msgstr "aviso"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 1d4bf835..db356941 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-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\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"
@@ -4538,7 +4538,7 @@ msgid "unable to close %s after read: %s"
 msgstr "impossível fechar %s após leitura: %s"
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "impossível fechar %s: %s"
@@ -4630,7 +4630,7 @@ msgstr ""
 "divert.\n"
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, fuzzy, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr "dois modos especificados: %s e --%s"
@@ -4654,13 +4654,13 @@ msgid "package may not contain newlines"
 msgstr "pacote não pode conter novas linhas"
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s precisa de um argumento <diretório>"
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "opção desconhecida `%s'"
@@ -4759,12 +4759,12 @@ msgstr "não foi possível fazer stat em nome antigo `%s': %s"
 msgid "cannot stat new name `%s': %s"
 msgstr "não foi possível fazer stat em novo nome `%s': %s"
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "erro ao checar `%s': %s"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4773,47 +4773,47 @@ msgstr ""
 "renomear involve sobreescrever `%s' com\n"
 "  arquivo diferente `%s', não permitido"
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "renomear: remover ligação antiga duplicada `%s': %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "renomear: renomear `%s' para `%s': %s"
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "criar divergências-novas: %s"
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "gravar divergências-novas: %s"
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "fechar divergências-novas: %s"
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "remover antigo divergências-antigos: %s"
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "criar novo divergências-antigos: %s"
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "instalar novas divergências: %s"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "erro interno: %s corrompido: %s"
@@ -5347,54 +5347,88 @@ msgstr "Nenhuma versão disponível."
 msgid "Current `best' version is %s."
 msgstr "`Melhor' versão atual é %s."
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
+#, fuzzy, perl-format
+msgid ""
+"warning: %s is supposed to be a symlink to %s, \n"
+"or nonexistent; however, readlink failed: %s"
+msgstr ""
+"aviso: %s supostamente seria uma ligação simbólica para %s\n"
+" (ou inexistente); porém, readlink falhou: %s"
+
+#: scripts/update-alternatives.pl:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr "Deixando %s (%s) apontando para %s."
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
+msgstr "Atualizando %s (%s) apontando para %s."
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr "Usando `%s' para fornecer `%s'."
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr "Removendo %s (%s). inapropriado com %s."
+
+#: scripts/update-alternatives.pl:288
+#, perl-format
+msgid "unable to remove %s: %s"
+msgstr "impossível remover %s: %s"
+
+#: scripts/update-alternatives.pl:301
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "argumento desconhecido `%s'"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install precisa de <ligação> <nome> <caminho> <prioridade>"
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr "prioridade deve ser um inteiro"
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s precisa de <nome> <caminho>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s precisa de <nome>"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave precisa de <ligação> <nome> <caminho>"
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "nome escravo %s duplicado"
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "ligação escrava %s duplicada"
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "nome %s é ambos primário e escravo"
 
-#: scripts/update-alternatives.pl:293
+#: scripts/update-alternatives.pl:351
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "ligação %s é ambos primário e escravo"
 
-#: scripts/update-alternatives.pl:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5402,31 +5436,21 @@ msgstr ""
 "precisa de --display, --config, --set, --install, --remove, --all, --remove-"
 "all ou --auto"
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr "--slave somente permitido com --install"
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Nenhuma alternativa para %s."
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Configurando seleção automática de %s."
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, perl-format
-msgid "unable to remove %s: %s"
-msgstr "impossível remover %s: %s"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5435,7 +5459,7 @@ msgstr ""
 "%s foi modificado (manualmente ou por um script).\n"
 "Mudando para atualizaçãoes automáticas somente."
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5445,127 +5469,70 @@ msgstr ""
 "(Você pode modificar as ligações simbólicas lá você mesmo caso desejado - "
 "veja `man ln'.)"
 
-#: scripts/update-alternatives.pl:392
+#: scripts/update-alternatives.pl:448
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Renomeando ligação %s de %s para %s."
 
-#: scripts/update-alternatives.pl:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, 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:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "nome de ligação escrava %s duplicada"
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, 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:433
+#: scripts/update-alternatives.pl:489
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 "Removendo alternativa selecionada manualmente - mudando para modo automático"
 
-#: scripts/update-alternatives.pl:447
+#: scripts/update-alternatives.pl:503
 #, 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:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Descartando ligação escrava obsoleta %s (%s)."
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, 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:497
+#: scripts/update-alternatives.pl:551
 #, 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:501
+#: scripts/update-alternatives.pl:555
 #, 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:516
+#: scripts/update-alternatives.pl:569
 #, 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:539
+#: scripts/update-alternatives.pl:592
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "Último pacote fornecendo %s (%s) removido, removendo-o."
 
-#: scripts/update-alternatives.pl:553
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a symlink to %s\n"
-" (or nonexistent); however, readlink failed: %s"
-msgstr ""
-"aviso: %s supostamente seria uma ligação simbólica para %s\n"
-" (ou inexistente); porém, readlink falhou: %s"
-
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr "não foi possível assegurar %s inexistente: %s"
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, 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:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, 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:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr "Deixando %s (%s) apontando para %s."
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr "Atualizando %s (%s) apontando para %s."
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr "Removendo %s (%s). inapropriado com %s."
-
-#: scripts/update-alternatives.pl:600
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a slave symlink to\n"
-" %s, or nonexistent; however, readlink failed: %s"
-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:634
+#: scripts/update-alternatives.pl:631
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5574,7 +5541,7 @@ msgstr ""
 "Existe somente 1 programa que fornece %s\n"
 "(%s). Nada a ser configurado.\n"
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5583,7 +5550,7 @@ msgstr ""
 "Existe somente 1 programa que fornece %s\n"
 "(%s). Nada a ser configurado.\n"
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5596,46 +5563,62 @@ msgstr ""
 "  Seleção      Alternativa\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 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:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr "Usando `%s' para fornecer `%s'."
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Não foi possível encontrar alternativa `%s'."
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "erro ao gravar na stdout: %s"
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "novas linhas proibidas em arquivos update-alternatives (%s)"
 
-#: scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:696
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "erro ou eof lendo %s para %s (%s)"
 
-#: scripts/update-alternatives.pl:736
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "missing newline after %s"
 msgstr "nova linha faltando para %s"
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, 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:715
+#, 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:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Problema sério: %s"
 
+#~ msgid "unable to ensure %s nonexistent: %s"
+#~ msgstr "não foi possível assegurar %s inexistente: %s"
+
+#~ msgid ""
+#~ "warning: %s is supposed to be a slave symlink to\n"
+#~ " %s, or nonexistent; however, readlink failed: %s"
+#~ msgstr ""
+#~ "aviso: %s supostamente seria uma ligação simbólica escrava para\n"
+#~ " %s, ou inexistente; porém, readlink falhou: %s"
+
 #~ msgid "warning"
 #~ msgstr "aviso"
 
diff --git a/po/ro.po b/po/ro.po
index 4c033704..4dbfaaa5 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ro\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\n"
 "PO-Revision-Date: 2007-09-11 01:12+0300\n"
 "Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -4604,7 +4604,7 @@ msgid "unable to close %s after read: %s"
 msgstr "imposibil a închide %s după citire: %s"
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "imposibil a închide %s: %s"
@@ -4698,7 +4698,7 @@ msgstr ""
 "și --divert.\n"
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr "au fost precizate două comenzi: %s și --%s"
@@ -4722,13 +4722,13 @@ msgid "package may not contain newlines"
 msgstr "pachetul nu poate conține caractere „linie nouă”"
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s necesită un <director> ca argument"
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "„%s” opțiune necunoscută"
@@ -4827,12 +4827,12 @@ msgstr "nu se poate citi starea vechiului nume „%s”: „%s”"
 msgid "cannot stat new name `%s': %s"
 msgstr "nu se poate citi starea noului nume „%s”: „%s”"
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "eroare la verificarea lui „%s”: %s"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4841,47 +4841,47 @@ msgstr ""
 "redenumirea implică supreascrierea lui „%s” cu\n"
 "  un alt fișier „%s”, lucru nepermis"
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "redenumire: ștergerea vechii legături duplicate „%s”: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "redenumire: redenumirea lui „%s” în „%s”: %s"
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "crearea noii redirectări: %s"
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "scrierea noii redirectări: %s"
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "închiderea noii redirectări: %s"
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "ștergerea vechii redirectări anterioare: %s"
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "crearea noii redirectări anterioare: %s"
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "instalarea noilor redirectări: %s"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "eroare internă: %s corupt: %s"
@@ -5431,54 +5431,88 @@ msgstr "Nici o versiune disponibilă."
 msgid "Current `best' version is %s."
 msgstr "Cea mai „bună” versiune în prezent este %s."
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
+#, fuzzy, perl-format
+msgid ""
+"warning: %s is supposed to be a symlink to %s, \n"
+"or nonexistent; however, readlink failed: %s"
+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:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr "Se lasă %s (%s) să indice spre %s."
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
+msgstr "Se actualizează %s (%s) să indice spre %s."
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr "Se folosește „%s” pentru a furniza „%s”."
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr "Se șterge %s (%s), nepotrivit cu %s."
+
+#: scripts/update-alternatives.pl:288
+#, perl-format
+msgid "unable to remove %s: %s"
+msgstr "imposibil a șterge %s: %s"
+
+#: scripts/update-alternatives.pl:301
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "argument necunoscut „%s”"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install necesită <legătură> <nume> <cale> <prioritate>"
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr "prioritatea trebuie să fie un întreg"
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s necesită <nume> <cale>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s necesită <nume>"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave necesită <legătură> <nume> <cale>"
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "numele de sclav %s este duplicat"
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "legătura de sclav %s este duplicată"
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, 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:293
+#: scripts/update-alternatives.pl:351
 #, 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:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5486,31 +5520,21 @@ msgstr ""
 "est enevoie de --display, --config, --set, --install, --remove, --all, --"
 "remove-all sau--auto"
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr "--slave este permis doar cu --install"
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Nu există alternative pentru %s."
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Se pregătesc selecțiile automate ale lui %s."
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, perl-format
-msgid "unable to remove %s: %s"
-msgstr "imposibil a șterge %s: %s"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5519,7 +5543,7 @@ msgstr ""
 "%s a fost schimbat (manual sau de un script).\n"
 "Se comută pe actualizare strict manuală."
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5530,126 +5554,70 @@ msgstr ""
 "(Puteți modifica the legăturile simbolice de acolo dacă doreți - a se vedea "
 "„man ln”.)"
 
-#: scripts/update-alternatives.pl:392
+#: scripts/update-alternatives.pl:448
 #, 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:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "imposibil a redenumi %s în %s: %s"
 
-#: scripts/update-alternatives.pl:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "numele de legătură sclav %s este duplicat"
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, 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:433
+#: scripts/update-alternatives.pl:489
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "Se șterge alternativa selectată manual - se comută în modul automat"
 
-#: scripts/update-alternatives.pl:447
+#: scripts/update-alternatives.pl:503
 #, 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:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Se renunță la legătura-sclav învechită %s (%s)."
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, 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:497
+#: scripts/update-alternatives.pl:551
 #, 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:501
+#: scripts/update-alternatives.pl:555
 #, 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:516
+#: scripts/update-alternatives.pl:569
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "imposibil a deschide %s pentru scriere: %s"
 
-#: scripts/update-alternatives.pl:539
+#: scripts/update-alternatives.pl:592
 #, 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:553
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a symlink to %s\n"
-" (or nonexistent); however, readlink failed: %s"
-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:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr "imposibil a asigura %s nonexistent: %s"
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, 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:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, perl-format
-msgid "unable to install %s as %s: %s"
-msgstr "imposibil a instala %s ca %s: %s"
-
-#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr "Se lasă %s (%s) să indice spre %s."
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr "Se actualizează %s (%s) să indice spre %s."
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr "Se șterge %s (%s), nepotrivit cu %s."
-
-#: scripts/update-alternatives.pl:600
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a slave symlink to\n"
-" %s, or nonexistent; however, readlink failed: %s"
-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:634
+#: scripts/update-alternatives.pl:631
 #, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5658,7 +5626,7 @@ msgstr ""
 "Nu există nici un program care să furnizeze %s\n"
 "Nu e nimic de configurat.\n"
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5667,7 +5635,7 @@ msgstr ""
 "Există doar un program care furnizează %s\n"
 "(%s). Nu e nimic de configurat.\n"
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5680,48 +5648,63 @@ msgstr ""
 "  Selecția     Alternativa\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 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:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr "Se folosește „%s” pentru a furniza „%s”."
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Alternativa „%s” nu poate fi găsită."
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "eroare la scriere la ieșirea standard: %s"
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, 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:735
+#: scripts/update-alternatives.pl:696
 #, 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:736
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "missing newline after %s"
 msgstr "lipsește linie nouă după %s"
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, 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:715
+#, perl-format
+msgid "unable to install %s as %s: %s"
+msgstr "imposibil a instala %s ca %s: %s"
+
+#: scripts/update-alternatives.pl:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Problemă gravă: %s"
 
+#~ msgid "unable to ensure %s nonexistent: %s"
+#~ msgstr "imposibil a asigura %s nonexistent: %s"
+
+#~ msgid ""
+#~ "warning: %s is supposed to be a slave symlink to\n"
+#~ " %s, or nonexistent; however, readlink failed: %s"
+#~ 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"
+
 #~ msgid "warning"
 #~ msgstr "avertisment"
 
diff --git a/po/ru.po b/po/ru.po
index 17d5e01c..2aaa59d8 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.14.7\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\n"
 "PO-Revision-Date: 2007-10-11 21:01+0400\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -4615,7 +4615,7 @@ msgid "unable to close %s after read: %s"
 msgstr "не удалось закрыть %s после чтения: %s"
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "не удалось закрыть %s: %s"
@@ -4708,7 +4708,7 @@ msgstr ""
 "divert.\n"
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr "указаны две команды: %s и --%s"
@@ -4732,13 +4732,13 @@ msgid "package may not contain newlines"
 msgstr "пакет не может содержать символов новой строки"
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s требуется аргумент <каталог>"
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "неизвестный параметр `%s'"
@@ -4837,12 +4837,12 @@ msgstr "не удалось выполнить stat старого имени `%
 msgid "cannot stat new name `%s': %s"
 msgstr "не удалось выполнить stat нового имени `%s': %s"
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "ошибка при проверке `%s': %s"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4851,47 +4851,47 @@ msgstr ""
 "переименование вызовет перезапись `%s'\n"
 "  другим файлом `%s', что не разрешено"
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "rename: удаление дублирующей старой ссылки `%s': %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "rename: переименование `%s' в `%s': %s"
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "создание diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "запись diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "закрытие diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "удаление старого diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "создание нового diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "установка нового файла diversions: %s"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "внутренняя ошибка: %s повреждён: %s"
@@ -5424,54 +5424,88 @@ msgstr "Нет доступных версий."
 msgid "Current `best' version is %s."
 msgstr "Текущая `лучшая' версия: %s."
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
+#, fuzzy, perl-format
+msgid ""
+"warning: %s is supposed to be a symlink to %s, \n"
+"or nonexistent; however, readlink failed: %s"
+msgstr ""
+"предупреждение: %s предположительно является символической ссылкой на %s\n"
+" (или на не существующую); однако, readlink завершился неудачно: %s"
+
+#: scripts/update-alternatives.pl:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr "Оставляется %s (%s), указывающая на %s."
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
+msgstr "Обновляется %s (%s), указывающая на %s."
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr "Используется `%s' для предоставления `%s'."
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr "Удаляется %s (%s) не соответствующая %s."
+
+#: scripts/update-alternatives.pl:288
+#, perl-format
+msgid "unable to remove %s: %s"
+msgstr "не удалось удалить %s: %s"
+
+#: scripts/update-alternatives.pl:301
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "неизвестный аргумент `%s'"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "для --install требуется указать <ссылку> <имя> <путь> <приоритет>"
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr "приоритет должен быть целым числом"
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "для --%s требуется <имя> <путь>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "для --%s требуется <имя>"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr "для --slave требуются аргументы <ссылка> <имя> <путь>"
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "повторяющееся подчинённое имя %s"
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "повторяющаяся подчинённая ссылка %s"
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "имя %s принадлежит и мастеру и подчинённому"
 
-#: scripts/update-alternatives.pl:293
+#: scripts/update-alternatives.pl:351
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "ссылка %s принадлежит и мастеру и подчинённому"
 
-#: scripts/update-alternatives.pl:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5479,31 +5513,21 @@ msgstr ""
 "требуется --display, --config, --set, --install, --remove, --all, --remove-"
 "all или --auto"
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr "команда --slave возможна только вместе с --install"
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Нет альтернатив для %s."
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Настройка автоматического выбора %s."
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, perl-format
-msgid "unable to remove %s: %s"
-msgstr "не удалось удалить %s: %s"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5512,7 +5536,7 @@ msgstr ""
 "%s была изменена (вручную или сценарием).\n"
 "Переключение на режим только ручного обновления."
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5521,127 +5545,70 @@ msgstr ""
 "Проверка доступных версий %s, обновление ссылок в %s ...\n"
 "(Вы можете изменить символические ссылки, если хотите -- смотрите `man ln'.)"
 
-#: scripts/update-alternatives.pl:392
+#: scripts/update-alternatives.pl:448
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Переименовывается ссылка %s из %s в %s."
 
-#: scripts/update-alternatives.pl:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "не удалось переименовать %s в %s: %s"
 
-#: scripts/update-alternatives.pl:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "повторяется имя подчинённой ссылки %s"
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "Переименовывается подчинённая ссылка %s из %s в %s."
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:489
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 "Удаляется альтернатива выбранная вручную -- переключение в автоматический "
 "режим"
 
-#: scripts/update-alternatives.pl:447
+#: scripts/update-alternatives.pl:503
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "Альтернатива %s для %s не зарегистрирована, не удаляется."
 
-#: scripts/update-alternatives.pl:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Отбрасывается устаревшая подчинённая ссылка %s (%s)."
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "Автоматическое обновление %s выключено, оставлено как есть."
 
-#: scripts/update-alternatives.pl:497
+#: scripts/update-alternatives.pl:551
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 "Чтобы вернуться в автоматический режим выполните команду `update-"
 "alternatives --auto %s'."
 
-#: scripts/update-alternatives.pl:501
+#: scripts/update-alternatives.pl:555
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Восстановление раннее неудачного обновления %s ..."
 
-#: scripts/update-alternatives.pl:516
+#: scripts/update-alternatives.pl:569
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "не удалось открыть %s на запись: %s"
 
-#: scripts/update-alternatives.pl:539
+#: scripts/update-alternatives.pl:592
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "Последний пакет, предоставлявший %s (%s) удалён, удаление."
 
-#: scripts/update-alternatives.pl:553
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a symlink to %s\n"
-" (or nonexistent); however, readlink failed: %s"
-msgstr ""
-"предупреждение: %s предположительно является символической ссылкой на %s\n"
-" (или на не существующую); однако, readlink завершился неудачно: %s"
-
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr "не удалось убедиться в не существовании %s: %s"
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, perl-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "не удалось создать символическую ссылку %s на %s: %s"
-
-#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, perl-format
-msgid "unable to install %s as %s: %s"
-msgstr "не удалось установить %s как %s: %s"
-
-#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr "Оставляется %s (%s), указывающая на %s."
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr "Обновляется %s (%s), указывающая на %s."
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr "Удаляется %s (%s) не соответствующая %s."
-
-#: scripts/update-alternatives.pl:600
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a slave symlink to\n"
-" %s, or nonexistent; however, readlink failed: %s"
-msgstr ""
-"предупреждение: %s предположительно является подчинённой символической\n"
-"ссылкой на %s, или на несуществующую; однако, readlink завершилась неудачно: "
-"%s"
-
-#: scripts/update-alternatives.pl:634
+#: scripts/update-alternatives.pl:631
 #, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5650,7 +5617,7 @@ msgstr ""
 "Нет программы, которая предоставляет %s.\n"
 "Настраивать нечего.\n"
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5659,7 +5626,7 @@ msgstr ""
 "Есть только одна программа, которая предоставляет %s\n"
 "(%s). Настраивать нечего.\n"
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5672,43 +5639,59 @@ msgstr ""
 "  Выбор        Альтернатива\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 "Нажмите enter, чтобы сохранить значение по умолчанию[*], или введите "
 "выбранное число: "
 
-#: scripts/update-alternatives.pl:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr "Используется `%s' для предоставления `%s'."
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Не удалось найти альтернативу `%s'."
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "ошибка записи в stdout: %s"
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "символы новой строки запрещены в файлах update-alternatives (%s)"
 
-#: scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:696
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "ошибка или конец файла при чтении %s для %s (%s)"
 
-#: scripts/update-alternatives.pl:736
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "missing newline after %s"
 msgstr "пропущен символ новой строки после %s"
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, perl-format
+msgid "unable to make %s a symlink to %s: %s"
+msgstr "не удалось создать символическую ссылку %s на %s: %s"
+
+#: scripts/update-alternatives.pl:715
+#, perl-format
+msgid "unable to install %s as %s: %s"
+msgstr "не удалось установить %s как %s: %s"
+
+#: scripts/update-alternatives.pl:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Серьёзная проблема: %s"
+
+#~ msgid "unable to ensure %s nonexistent: %s"
+#~ msgstr "не удалось убедиться в не существовании %s: %s"
+
+#~ msgid ""
+#~ "warning: %s is supposed to be a slave symlink to\n"
+#~ " %s, or nonexistent; however, readlink failed: %s"
+#~ msgstr ""
+#~ "предупреждение: %s предположительно является подчинённой символической\n"
+#~ "ссылкой на %s, или на несуществующую; однако, readlink завершилась "
+#~ "неудачно: %s"
diff --git a/po/sk.po b/po/sk.po
index 576ccd01..b987c3c8 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-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\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"
@@ -4473,7 +4473,7 @@ msgid "unable to close %s after read: %s"
 msgstr "nedá sa zatvoriť %s po načítaní: %s"
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "nedá sa zatvoriť %s: %s"
@@ -4564,7 +4564,7 @@ msgstr ""
 "a --divert.\n"
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, fuzzy, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr "zadané dva režimy: %s a --%s"
@@ -4588,13 +4588,13 @@ msgid "package may not contain newlines"
 msgstr "názov balíka nemôže obsahovať znaky nového riadku"
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s vyžaduje parameter <adresár>"
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "neznáma voľba `%s'"
@@ -4693,12 +4693,12 @@ msgstr "nedá sa zistiť stav starého názvu `%s': `%s'"
 msgid "cannot stat new name `%s': %s"
 msgstr "nedá sa zistiť stav nového názvu `%s': `%s'"
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "chyba pri kontrole `%s': %s"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4707,47 +4707,47 @@ msgstr ""
 "premenovanie znamená prepísanie `%s'\n"
 "  súborom `%s', čo nie je povolené"
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "premenovanie: odstránenie duplicitného starého odkazu `%s': %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "premenovanie: premenovanie `%s' na `%s': %s"
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "vytváranie súboru diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "zápis súboru diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "zatvorenie súboru diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "zmazanie starého súboru diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "vytváranie nového súboru diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "inštalácia nového súboru diversions: %s"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "interná chyba: %s poškodenie: %s"
@@ -5275,54 +5275,88 @@ msgstr "Nie sú dostupné žiadne verzie."
 msgid "Current `best' version is %s."
 msgstr "Momentálne je `najlepšia' verzia %s."
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
+#, fuzzy, perl-format
+msgid ""
+"warning: %s is supposed to be a symlink to %s, \n"
+"or nonexistent; however, readlink failed: %s"
+msgstr ""
+"upozornenie: %s by mal byť symbolický odkaz na %s,\n"
+" (alebo odkaz neexistuje), ale volanie readlink zlyhalo: %s"
+
+#: scripts/update-alternatives.pl:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr "%s (%s) sa ponecháva, aby ukazoval na %s."
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
+msgstr "%s (%s) sa aktualizuje, aby ukazoval na %s."
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr "Použije sa `%s' na poskytnutie `%s'."
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr "%s (%s) sa odstraňuje, nepatrí k %s."
+
+#: scripts/update-alternatives.pl:288
+#, perl-format
+msgid "unable to remove %s: %s"
+msgstr "nedá sa odstrániť %s: %s"
+
+#: scripts/update-alternatives.pl:301
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "neznámy parameter `%s'"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install vyžaduje <linku> <názov> <cestu> <prioritu>"
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr "priorita musí byť celé číslo"
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s vyžaduje <názov> <cestu>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s vyžaduje <názov>"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave vyžaduje <linku> <názov> <cestu>"
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "závislý názov %s je duplicitný"
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "závislý odkaz %s je duplicitný"
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "názov %s je primárny aj závislý"
 
-#: scripts/update-alternatives.pl:293
+#: scripts/update-alternatives.pl:351
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "odkaz %s je primárny aj závislý"
 
-#: scripts/update-alternatives.pl:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5330,31 +5364,21 @@ msgstr ""
 "potrebujete --display, --config, --set, --install, --remove, --all, --remove-"
 "all alebo --auto"
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr "--slave je povolené iba s --install"
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Žiadne alternatívy pre %s"
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Nastavuje sa automatický výber %s"
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, perl-format
-msgid "unable to remove %s: %s"
-msgstr "nedá sa odstrániť %s: %s"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5363,7 +5387,7 @@ msgstr ""
 "%s sa zmenil (manuálne alebo skriptom).\n"
 "Prepína sa len na manuálne aktualizácie."
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5372,125 +5396,69 @@ 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:392
+#: scripts/update-alternatives.pl:448
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Linka %s sa premenuje z %s na %s."
 
-#: scripts/update-alternatives.pl:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "nedá sa premenovať %s na %s: %s"
 
-#: scripts/update-alternatives.pl:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "názov závislého odkazu %s je duplicitný"
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, 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:433
+#: scripts/update-alternatives.pl:489
 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:447
+#: scripts/update-alternatives.pl:503
 #, 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:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Zahadzuje sa zastaralý závislý odkaz %s (%s)."
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, 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:497
+#: scripts/update-alternatives.pl:551
 #, 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:501
+#: scripts/update-alternatives.pl:555
 #, 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:516
+#: scripts/update-alternatives.pl:569
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "%s sa nedá otvoriť na zápis: %s"
 
-#: scripts/update-alternatives.pl:539
+#: scripts/update-alternatives.pl:592
 #, 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:553
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a symlink to %s\n"
-" (or nonexistent); however, readlink failed: %s"
-msgstr ""
-"upozornenie: %s by mal byť symbolický odkaz na %s,\n"
-" (alebo odkaz neexistuje), ale volanie readlink zlyhalo: %s"
-
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr "nedá sa zaručiť, že %s neexistuje: %s"
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, 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:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, perl-format
-msgid "unable to install %s as %s: %s"
-msgstr "nedá sa nainštalovať %s ako %s: %s"
-
-#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr "%s (%s) sa ponecháva, aby ukazoval na %s."
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr "%s (%s) sa aktualizuje, aby ukazoval na %s."
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr "%s (%s) sa odstraňuje, nepatrí k %s."
-
-#: scripts/update-alternatives.pl:600
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a slave symlink to\n"
-" %s, or nonexistent; however, readlink failed: %s"
-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:634
+#: scripts/update-alternatives.pl:631
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5499,7 +5467,7 @@ msgstr ""
 "Existuje len jeden program poskytujúci %s\n"
 "(%s). Nie je čo nastavovať.\n"
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5508,7 +5476,7 @@ msgstr ""
 "Existuje len jeden program poskytujúci %s\n"
 "(%s). Nie je čo nastavovať.\n"
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5521,46 +5489,61 @@ msgstr ""
 "  Výber        Alternatíva\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 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:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr "Použije sa `%s' na poskytnutie `%s'."
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Nedá sa nájsť alternatíva `%s'."
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "chyba pri zápise na štandartný výstup: %s"
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, 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:735
+#: scripts/update-alternatives.pl:696
 #, 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:736
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "missing newline after %s"
 msgstr "chýbajúci nový riadok za %s"
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, 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:715
+#, perl-format
+msgid "unable to install %s as %s: %s"
+msgstr "nedá sa nainštalovať %s ako %s: %s"
+
+#: scripts/update-alternatives.pl:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Vážny problém: %s"
 
+#~ msgid "unable to ensure %s nonexistent: %s"
+#~ msgstr "nedá sa zaručiť, že %s neexistuje: %s"
+
+#~ msgid ""
+#~ "warning: %s is supposed to be a slave symlink to\n"
+#~ " %s, or nonexistent; however, readlink failed: %s"
+#~ msgstr ""
+#~ "upozornenie: %s by mal byť závislý symbolický odkaz na %s,\n"
+#~ " (alebo odkaz neexistuje), ale volanie readlink zlyhalo: %s"
+
 #~ msgid "warning"
 #~ msgstr "upozornenie"
 
diff --git a/po/sv.po b/po/sv.po
index dbaa7eb7..dffe10a0 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,13 +7,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14.6\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\n"
 "PO-Revision-Date: 2007-12-19 10:22+0100\n"
 "Last-Translator: Peter Karlsson <peterk@debian.org>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: lib/compat.c:46
 msgid "unable to open tmpfile for vsnprintf"
@@ -4446,7 +4446,7 @@ msgid "unable to close %s after read: %s"
 msgstr "kunde inte stänga %s efter läsning: %s"
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "kunde inte stänga %s: %s"
@@ -4537,7 +4537,7 @@ msgstr ""
 "divert.\n"
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr "två kommandon angivna: %s och --%s"
@@ -4561,13 +4561,13 @@ msgid "package may not contain newlines"
 msgstr "paket kan inte innehålla nyradstecken"
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s behöver ett <katalog>-argument"
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "okänd flagga \"%s\""
@@ -4666,12 +4666,12 @@ msgstr "kan inte ta status p
 msgid "cannot stat new name `%s': %s"
 msgstr "kan inte ta status på nytt namn \"%s\": %s"
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "fel vid kontroll av \"%s\": %s"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4680,47 +4680,47 @@ msgstr ""
 "namnbyte innebär överskrivning av \"%s\" med\n"
 "  annan fil \"%s\", ej tillåtet"
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "namnbyte: ta bort duplicerad gammal länk \"%s\": %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "namnbyte: namnbyte på \"%s\" till \"%s\": %s"
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "skapa diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "skriva ny diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "stänga diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "ta bort gammal diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "skapa ny diversions-old: %s"
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "installera ny diversions: %s"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "internt fel: %s trasig: %s"
@@ -5251,54 +5251,88 @@ msgstr "Inga versioner tillg
 msgid "Current `best' version is %s."
 msgstr "Nuvarande \"bästa\" version är %s."
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
+#, fuzzy, perl-format
+msgid ""
+"warning: %s is supposed to be a symlink to %s, \n"
+"or nonexistent; however, readlink failed: %s"
+msgstr ""
+"varning: %s skulle vara en symbolisk länk till %s\n"
+" (eller inte finnas); readlink misslyckades dock: %s"
+
+#: scripts/update-alternatives.pl:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr "Lämnar %s (%s) att peka på %s."
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
+msgstr "Uppdaterar %s (%s) att peka på %s."
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr "Låter \"%s\" tillhandahålla \"%s\"."
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr "Tar bort %s (%s), inte lämplig med %s."
+
+#: scripts/update-alternatives.pl:288
+#, perl-format
+msgid "unable to remove %s: %s"
+msgstr "kunde inte ta bort %s: %s"
+
+#: scripts/update-alternatives.pl:301
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "okänt argument \"%s\""
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install behöver <länk> <namn> <sökväg> <prioritet>"
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr "prioritet måste vara ett heltal"
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s behöver <namn> <sökväg>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s behöver <namn>"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave behöver <länk> <namn> <sökväg>"
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "slavnamnet %s duplicerat"
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "slavlänken %s duplicerad"
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "namnet %s är både primär och slav"
 
-#: scripts/update-alternatives.pl:293
+#: scripts/update-alternatives.pl:351
 #, 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:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5306,31 +5340,21 @@ msgstr ""
 "behöver --display, --config, --set, --install, --remove, --all, --remove-all "
 "eller --auto"
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr "--slave tillåts endast tillsammans med --install"
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Inga alternativ för %s."
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "Aktiverar automatiskt val av %s."
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, perl-format
-msgid "unable to remove %s: %s"
-msgstr "kunde inte ta bort %s: %s"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5339,7 +5363,7 @@ msgstr ""
 "%s har ändrats (manuellt eller av ett skript).\n"
 "Växlar till enbart manuella uppdateringar."
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5348,124 +5372,68 @@ 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:392
+#: scripts/update-alternatives.pl:448
 #, 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:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "kunde inte byta namn på %s till %s: %s"
 
-#: scripts/update-alternatives.pl:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "slavlänknamnet %s duplicerat"
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, 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:433
+#: scripts/update-alternatives.pl:489
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "Tar bort manuellt valda alternativ - växlar till autoläge"
 
-#: scripts/update-alternatives.pl:447
+#: scripts/update-alternatives.pl:503
 #, 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:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "Kastar bort föråldrad slavlänk %s (%s)."
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, 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:497
+#: scripts/update-alternatives.pl:551
 #, 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:501
+#: scripts/update-alternatives.pl:555
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "Återhämtar från tidigare misslyckad uppdatering av %s ..."
 
-#: scripts/update-alternatives.pl:516
+#: scripts/update-alternatives.pl:569
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "kunde inte öppna %s för skrivning: %s"
 
-#: scripts/update-alternatives.pl:539
+#: scripts/update-alternatives.pl:592
 #, 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:553
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a symlink to %s\n"
-" (or nonexistent); however, readlink failed: %s"
-msgstr ""
-"varning: %s skulle vara en symbolisk länk till %s\n"
-" (eller inte finnas); readlink misslyckades dock: %s"
-
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr "kunde inte försäkra att %s inte finns: %s"
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, 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:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, perl-format
-msgid "unable to install %s as %s: %s"
-msgstr "kunde inte installera %s som %s: %s"
-
-#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr "Lämnar %s (%s) att peka på %s."
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr "Uppdaterar %s (%s) att peka på %s."
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr "Tar bort %s (%s), inte lämplig med %s."
-
-#: scripts/update-alternatives.pl:600
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a slave symlink to\n"
-" %s, or nonexistent; however, readlink failed: %s"
-msgstr ""
-"varning: %s skulle vara en slav-symbolisk länk till\n"
-" %s, eller inte finnas; readlink misslyckades dock: %s"
-
-#: scripts/update-alternatives.pl:634
+#: scripts/update-alternatives.pl:631
 #, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5474,7 +5442,7 @@ msgstr ""
 "Inget program tillhandahåller %s.\n"
 "Inget att konfigurera.\n"
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5483,7 +5451,7 @@ msgstr ""
 "Endast ett program tillhandahåller %s\n"
 "(%s). Inget att konfigurera.\n"
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5496,46 +5464,61 @@ msgstr ""
 "    Urval      Alternativ\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 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:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr "Låter \"%s\" tillhandahålla \"%s\"."
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Hittar inte alternativet \"%s\"."
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "fel vid skrivning till stdout: %s"
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "nyradstecken tillåts inte i update-alternatives-file (%s)"
 
-#: scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:696
 #, 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:736
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "missing newline after %s"
 msgstr "saknat nyradstecken efter %s"
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, 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:715
+#, perl-format
+msgid "unable to install %s as %s: %s"
+msgstr "kunde inte installera %s som %s: %s"
+
+#: scripts/update-alternatives.pl:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Allvarligt problem: %s"
 
+#~ msgid "unable to ensure %s nonexistent: %s"
+#~ msgstr "kunde inte försäkra att %s inte finns: %s"
+
+#~ msgid ""
+#~ "warning: %s is supposed to be a slave symlink to\n"
+#~ " %s, or nonexistent; however, readlink failed: %s"
+#~ msgstr ""
+#~ "varning: %s skulle vara en slav-symbolisk länk till\n"
+#~ " %s, eller inte finnas; readlink misslyckades dock: %s"
+
 #~ msgid "warning"
 #~ msgstr "varning"
 
@@ -5589,7 +5572,8 @@ msgstr "Allvarligt problem: %s"
 #~ msgstr "kunde inte skapa %.250s"
 
 #~ msgid "`%s' field, reference to `%.255s': version contains ` '"
-#~ msgstr "\"%s\"-fältet: referens till \"%.255s\": versionen innehåller \" \""
+#~ msgstr ""
+#~ "\"%s\"-fältet: referens till \"%.255s\": versionen innehåller \" \""
 
 #~ msgid "%s: can't open %s: %s"
 #~ msgstr "%s: kunde inte öppna %s: %s"
diff --git a/po/th.po b/po/th.po
index 25838726..4e24afb9 100644
--- a/po/th.po
+++ b/po/th.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-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\n"
 "PO-Revision-Date: 2007-10-13 20:52+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@@ -4354,7 +4354,7 @@ msgid "unable to close %s after read: %s"
 msgstr "ไม่สามารถปิด %s หลังจากอ่านแล้ว: %s"
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "ไม่สามารถปิด %s: %s"
@@ -4442,7 +4442,7 @@ msgstr ""
 "สคริปต์ preinst/postrm ของแพกเกจควรระบุ --package และ --divert เสมอ\n"
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr "มีการระบุคำสั่งสองคำสั่ง: %s และ --%s"
@@ -4466,13 +4466,13 @@ msgid "package may not contain newlines"
 msgstr "ชื่อแพกเกจห้ามมีอักขระขึ้นบรรทัดใหม่"
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s ต้องการอาร์กิวเมนต์ <directory>"
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "ไม่รู้จักตัวเลือก `%s'"
@@ -4571,12 +4571,12 @@ msgstr "ไม่สามารถ stat ชื่อเดิม `%s': %s"
 msgid "cannot stat new name `%s': %s"
 msgstr "ไม่สามารถ stat ชื่อใหม่ `%s': %s"
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "เกิดข้อผิดพลาดขณะตรวจสอบ `%s': %s"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4585,47 +4585,47 @@ msgstr ""
 "การเปลี่ยนชื่อทำให้ต้องเขียนทับ `%s' ด้วย\n"
 " แฟ้ม `%s' ที่เป็นคนละแฟ้ม ซึ่งไม่อนุญาต"
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "rename: ลบลิงก์เดิม `%s' ซึ่งซ้ำกัน: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "rename: เปลี่ยนชื่อ `%s' ไปเป็น `%s': %s"
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "สร้าง diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "เขียน diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "ปิด diversions-new: %s"
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "ลบ diversions-old ฉบับเดิม: %s"
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "สร้าง diversions-old ฉบับใหม่: %s"
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "ติดตั้ง diversions ฉบับใหม่: %s"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "ข้อผิดพลาดภายใน: %s เสียหาย: %s"
@@ -5145,54 +5145,88 @@ msgstr "ไม่มีทางเลือกอยู่"
 msgid "Current `best' version is %s."
 msgstr "ทางเลือกที่ `ดีที่สุด' ในขณะนี้คือ %s"
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
+#, fuzzy, perl-format
+msgid ""
+"warning: %s is supposed to be a symlink to %s, \n"
+"or nonexistent; however, readlink failed: %s"
+msgstr ""
+"คำเตือน: %s ควรจะเป็น symlink ไปยัง %s\n"
+" (หรือไม่ก็ไม่มีอยู่เลย) แต่ปรากฏว่า readlink ล้มเหลว: %s"
+
+#: scripts/update-alternatives.pl:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr "จะปล่อยให้ %s (%s) ชี้ไปยัง %s"
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
+msgstr "กำลังปรับข้อมูล %s (%s) ให้ชี้ไปยัง %s"
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr "จะใช้ `%s' เพื่อจัดเตรียม `%s'"
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr "กำลังลบ %s (%s) เพราะไม่เหมาะกับ %s"
+
+#: scripts/update-alternatives.pl:288
+#, perl-format
+msgid "unable to remove %s: %s"
+msgstr "ไม่สามารถลบ %s: %s"
+
+#: scripts/update-alternatives.pl:301
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "ไม่รู้จักอาร์กิวเมนต์ `%s'"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install ต้องการ <link> <name> <path> <priority>"
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr "ความสำคัญต้องเป็นตัวเลข"
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s ต้องการ <name> <path>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s ต้องการ <name>"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave ต้องการ <link> <name> <path>"
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "ชื่อหัวข้อลูก %s ซ้ำ"
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "ลิงก์ลูก %s ซ้ำ"
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "ชื่อ %s เป็นทั้งหัวข้อหลักและหัวข้อลูก"
 
-#: scripts/update-alternatives.pl:293
+#: scripts/update-alternatives.pl:351
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "ลิงก์ %s เป็นทั้งลิงก์หลักและลิงก์ลูก"
 
-#: scripts/update-alternatives.pl:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5200,31 +5234,21 @@ msgstr ""
 "ต้องการ --display, --config, --set, --install, --remove, --all, --remove-all "
 "หรือ --auto"
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr "--slave ใช้ได้กับ --install เท่านั้น"
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "ไม่มีทางเลือกสำหรับ %s"
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "กำลังกำหนดทางเลือกแบบอัตโนมัติสำหรับ %s"
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, perl-format
-msgid "unable to remove %s: %s"
-msgstr "ไม่สามารถลบ %s: %s"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5233,7 +5257,7 @@ msgstr ""
 "%s ได้ถูกเปลี่ยนแปลง (ด้วยการสั่งเองหรือผ่านสคริปต์)\n"
 "จะเปลี่ยนสู่การปรับข้อมูลแบบสั่งเองเท่านั้น"
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5242,123 +5266,67 @@ msgstr ""
 "กำลังตรวจสอบทางเลือกที่มีอยู่ของ %s และปรับลิงก์ใน %s ...\n"
 "(คุณอาจแก้ไข symlink ที่นั่นเองได้ถ้าต้องการ - ดู `man ln')"
 
-#: scripts/update-alternatives.pl:392
+#: scripts/update-alternatives.pl:448
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "กำลังเปลี่ยนชื่อลิงก์ %s จาก %s เป็น %s"
 
-#: scripts/update-alternatives.pl:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไปเป็น %s: %s"
 
-#: scripts/update-alternatives.pl:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "ชื่อลิงก์ลูก %s ซ้ำ"
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "กำลังเปลี่ยนชื่อลิงก์ลูก %s จาก %s เป็น %s"
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:489
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "กำลังลบทางเลือกที่เลือกแบบสั่งเอง - จะเปลี่ยนเข้าสู่โหมดอัตโนมัติ"
 
-#: scripts/update-alternatives.pl:447
+#: scripts/update-alternatives.pl:503
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "ทางเลือก %s สำหรับ %s ไม่ได้ลงทะเบียนไว้ จะไม่ลบ"
 
-#: scripts/update-alternatives.pl:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "จะล้างลิงก์ลูกที่เลิกใช้แล้ว %s (%s)"
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "การปรับข้อมูลแบบอัตโนมัติของ %s ถูกปิดไว้ จะไม่แตะต้อง"
 
-#: scripts/update-alternatives.pl:497
+#: scripts/update-alternatives.pl:551
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 "หากต้องการกลับสู่การปรับข้อมูลแบบอัตโนมัติ ใช้คำสั่ง `update-alternatives --auto %s'"
 
-#: scripts/update-alternatives.pl:501
+#: scripts/update-alternatives.pl:555
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "กำลังฟื้นจากการปรับข้อมูลที่ล้มเหลวของ %s ..."
 
-#: scripts/update-alternatives.pl:516
+#: scripts/update-alternatives.pl:569
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "ไม่สามารถเปิด %s เพื่อเขียน: %s"
 
-#: scripts/update-alternatives.pl:539
+#: scripts/update-alternatives.pl:592
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "แพกเกจสุดท้ายที่จัดเตรียม %s (%s) ถูกถอดถอน จะลบทิ้ง"
 
-#: scripts/update-alternatives.pl:553
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a symlink to %s\n"
-" (or nonexistent); however, readlink failed: %s"
-msgstr ""
-"คำเตือน: %s ควรจะเป็น symlink ไปยัง %s\n"
-" (หรือไม่ก็ไม่มีอยู่เลย) แต่ปรากฏว่า readlink ล้มเหลว: %s"
-
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr "ไม่สามารถทำให้แน่ใจว่า %s ไม่มีอยู่: %s"
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, perl-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "ไม่สามารถสร้าง %s ให้เป็น symlink ไปยัง %s: %s"
-
-#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, perl-format
-msgid "unable to install %s as %s: %s"
-msgstr "ไม่สามารถติดตั้ง %s เป็น %s: %s"
-
-#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr "จะปล่อยให้ %s (%s) ชี้ไปยัง %s"
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr "กำลังปรับข้อมูล %s (%s) ให้ชี้ไปยัง %s"
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr "กำลังลบ %s (%s) เพราะไม่เหมาะกับ %s"
-
-#: scripts/update-alternatives.pl:600
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a slave symlink to\n"
-" %s, or nonexistent; however, readlink failed: %s"
-msgstr ""
-"คำเตือน: %s ควรจะเป็น symlink ลูกไปยัง %s\n"
-" หรือไม่ก็ไม่มีอยู่เลย แต่ปรากฏว่า readlink ล้มเหลว: %s"
-
-#: scripts/update-alternatives.pl:634
+#: scripts/update-alternatives.pl:631
 #, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5367,7 +5335,7 @@ msgstr ""
 "ไม่มีโปรแกรมที่จัดเตรียม %s\n"
 "ไม่มีอะไรจะตั้งค่า\n"
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5376,7 +5344,7 @@ msgstr ""
 "มีเพียง 1 โปรแกรมที่จัดเตรียม %s\n"
 "(%s) ไม่มีอะไรจะตั้งค่า\n"
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5389,45 +5357,60 @@ msgstr ""
 "  รายการ       ทางเลือก\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr "กด enter เพื่อคงค่าปริยาย[*] หรือพิมพ์ตัวเลขประจำตัวเลือก: "
 
-#: scripts/update-alternatives.pl:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr "จะใช้ `%s' เพื่อจัดเตรียม `%s'"
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "ไม่พบทางเลือก `%s'"
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "เกิดข้อผิดพลาดขณะเขียน stdout: %s"
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "ห้ามใช้อักขระขึ้นบรรทัดใหม่ในแฟ้มสำหรับ update-alternatives (%s)"
 
-#: scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:696
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "เกิดข้อผิดพลาดหรือพบจุดจบแฟ้มขณะอ่าน %s สำหรับ %s (%s)"
 
-#: scripts/update-alternatives.pl:736
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "missing newline after %s"
 msgstr "ขาดอักขระขึ้นบรรทัดใหม่หลัง %s"
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, perl-format
+msgid "unable to make %s a symlink to %s: %s"
+msgstr "ไม่สามารถสร้าง %s ให้เป็น symlink ไปยัง %s: %s"
+
+#: scripts/update-alternatives.pl:715
+#, perl-format
+msgid "unable to install %s as %s: %s"
+msgstr "ไม่สามารถติดตั้ง %s เป็น %s: %s"
+
+#: scripts/update-alternatives.pl:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "ปัญหาร้ายแรง: %s"
 
+#~ msgid "unable to ensure %s nonexistent: %s"
+#~ msgstr "ไม่สามารถทำให้แน่ใจว่า %s ไม่มีอยู่: %s"
+
+#~ msgid ""
+#~ "warning: %s is supposed to be a slave symlink to\n"
+#~ " %s, or nonexistent; however, readlink failed: %s"
+#~ msgstr ""
+#~ "คำเตือน: %s ควรจะเป็น symlink ลูกไปยัง %s\n"
+#~ " หรือไม่ก็ไม่มีอยู่เลย แต่ปรากฏว่า readlink ล้มเหลว: %s"
+
 #~ msgid "warning"
 #~ msgstr "คำเตือน"
 
diff --git a/po/tl.po b/po/tl.po
index 3d05e970..94004f10 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -2,13 +2,13 @@
 # Copyright (C) 2005 Eric Pareja
 # This file is distributed under the same license as the package dpkg.
 # Eric Pareja, 2005
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\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"
@@ -4451,7 +4451,7 @@ msgid "unable to close %s after read: %s"
 msgstr "bigo sa pagsara matapos ng pagbasa: `%.255s'"
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, fuzzy, perl-format
 msgid "unable to close %s: %s"
 msgstr "hindi ma-execute ang %s"
@@ -4514,7 +4514,7 @@ msgid ""
 msgstr ""
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr ""
@@ -4541,13 +4541,13 @@ msgid "package may not contain newlines"
 msgstr "Walang laman ang paketeng `%s' (!)\n"
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, fuzzy, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--build ay nangangailangan ng argumentong directory"
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, fuzzy, perl-format
 msgid "unknown option `%s'"
 msgstr "di kilalang opsyon --%s"
@@ -4643,60 +4643,60 @@ msgstr "hindi ma-stat ang `%.255s' (sa `%.255s')"
 msgid "cannot stat new name `%s': %s"
 msgstr "hindi ma-stat ang `%.255s' (sa `%.255s')"
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, fuzzy, perl-format
 msgid "error checking `%s': %s"
 msgstr "error sa pagsulat ng `%s'"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
 "  different file `%s', not allowed"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, fuzzy, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr ""
 "dpkg: %s: babala - bigo sa pagpalit ng pangalan ng `%.250s' sa `%.250s': %s\n"
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, fuzzy, perl-format
 msgid "create diversions-new: %s"
 msgstr "error sa pagbasa sa dibersyon [i]"
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, fuzzy, perl-format
 msgid "write diversions-new: %s"
 msgstr "dibersyon ng %s"
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, fuzzy, perl-format
 msgid "close diversions-new: %s"
 msgstr "dibersyon ng %s"
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, fuzzy, perl-format
 msgid "create new diversions-old: %s"
 msgstr "error sa pagbasa sa dibersyon [i]"
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, fuzzy, perl-format
 msgid "install new diversions: %s"
 msgstr "hindi mailuklok ang bagong bersyon ng `%.255s'"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, fuzzy, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "%s: internal gzip error: pagsulat: `%s'"
@@ -5142,209 +5142,179 @@ msgstr "(walang paglalarawan)"
 msgid "Current `best' version is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
+#, 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:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr ""
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
+msgstr ""
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr "%s (subprocess): %s\n"
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr ""
+
+#: scripts/update-alternatives.pl:288
+#, fuzzy, perl-format
+msgid "unable to remove %s: %s"
+msgstr "hindi ma-execute ang %s"
+
+#: scripts/update-alternatives.pl:301
 #, fuzzy, perl-format
 msgid "unknown argument `%s'"
 msgstr "di kilalang uri ng compression `%s'!"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr ""
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, fuzzy, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s ay nangangailangan ng argumentong pangalan ng talaksang .deb"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, fuzzy, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s ay hindi tumatanggap ng mga argumento"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:293
+#: scripts/update-alternatives.pl:351
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
 msgstr ""
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr ""
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, fuzzy, perl-format
-msgid "unable to remove %s: %s"
-msgstr "hindi ma-execute ang %s"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
 "Switching to manual updates only."
 msgstr ""
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, 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:392
+#: scripts/update-alternatives.pl:448
 #, fuzzy, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Binubuklat ang %s (mula sa %s) ...\n"
 
-#: scripts/update-alternatives.pl:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, fuzzy, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "hindi ma-stat ang %s `%.250s'"
 
-#: scripts/update-alternatives.pl:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:489
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 
-#: scripts/update-alternatives.pl:447
+#: scripts/update-alternatives.pl:503
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: scripts/update-alternatives.pl:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr ""
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr ""
 
-#: scripts/update-alternatives.pl:497
+#: scripts/update-alternatives.pl:551
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:501
+#: scripts/update-alternatives.pl:555
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr ""
 
-#: scripts/update-alternatives.pl:516
+#: scripts/update-alternatives.pl:569
 #, fuzzy, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "hindi mabuksan ang pinagmulan na talaksang `%.250s'"
 
-#: scripts/update-alternatives.pl:539
+#: scripts/update-alternatives.pl:592
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr ""
 
-#: scripts/update-alternatives.pl:553
-#, 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:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, fuzzy, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr "hindi ma-execute ang bagong %s"
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, 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:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, fuzzy, perl-format
-msgid "unable to install %s as %s: %s"
-msgstr "hindi maluklok ang `%.250s' bilang `%.250s'"
-
-#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr ""
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr ""
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr ""
-
-#: scripts/update-alternatives.pl:600
-#, 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:634
+#: scripts/update-alternatives.pl:631
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5352,14 +5322,14 @@ msgid ""
 msgstr ""
 "  %.250s ay nagbibigay ng %.250s ngunit ito'y tatanggalan ng pagkaayos.\n"
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
 "(%s). Nothing to configure.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5368,45 +5338,54 @@ msgid ""
 "-----------------------------------------------\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 
-#: scripts/update-alternatives.pl:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr ""
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, fuzzy, perl-format
 msgid "error writing stdout: %s"
 msgstr "error sa pagsulat ng `%s'"
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:696
 #, 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:736
+#: scripts/update-alternatives.pl:698
 #, fuzzy, perl-format
 msgid "missing newline after %s"
 msgstr "sira ang talaksang `%.250s' - may kulang na newline matapos ang %.250s"
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, 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:715
+#, fuzzy, perl-format
+msgid "unable to install %s as %s: %s"
+msgstr "hindi maluklok ang `%.250s' bilang `%.250s'"
+
+#: scripts/update-alternatives.pl:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr ""
 
+#, fuzzy
+#~ msgid "unable to ensure %s nonexistent: %s"
+#~ msgstr "hindi ma-execute ang bagong %s"
+
 #~ msgid "warning"
 #~ msgstr "babala"
 
diff --git a/po/vi.po b/po/vi.po
index 4d1e167a..f21031dc 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -2,12 +2,12 @@
 # Copyright © 2007 Free Software Foundation, Inc.
 # Phan Vinh Thinh <teppi@vnoss.org>, 2005.
 # Clytie Siddall <clytie@riverland.net.au>, 2006-2007.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\n"
 "PO-Revision-Date: 2007-09-02 15:07+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -134,8 +134,7 @@ msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
 "max=%d)"
 msgstr ""
-"thư mục cập nhật chứa tập tin « %.250s » có tên quá dài (độ dài=%d, tối đa=%"
-"d)"
+"thư mục cập nhật chứa tập tin « %.250s » có tên quá dài (độ dài=%d, tối đa=%d)"
 
 #: lib/dbmodify.c:63
 #, c-format
@@ -210,8 +209,7 @@ msgstr "không thể cắt ngắn cho trạng thái đã cập nhật của « %
 #: lib/dbmodify.c:271
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
-msgstr ""
-"không thể fsync (đồng bộ tập tin) trạng thái đã cập nhật của « %.250s »"
+msgstr "không thể fsync (đồng bộ tập tin) trạng thái đã cập nhật của « %.250s »"
 
 #: lib/dbmodify.c:273
 #, c-format
@@ -342,8 +340,8 @@ msgstr "không cho phép trường chi tiết tập tin « %s » trong tập tin
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr ""
-"quá nhiều giá trị trong trường chi tiết tập tin « %s » (so sánh với những "
-"cái khác)"
+"quá nhiều giá trị trong trường chi tiết tập tin « %s » (so sánh với những cái "
+"khác)"
 
 #: lib/fields.c:117
 #, c-format
@@ -946,14 +944,13 @@ msgid ""
 "trying to overwrite `%.250s', which is the diverted version of `"
 "%.250s' (package: %.100s)"
 msgstr ""
-"đang thử ghi đè lên « %.255s », phiên bản đã chuyển hướng của « %.255s "
-"» (gói: %.100s)"
+"đang thử ghi đè lên « %.255s », phiên bản đã chuyển hướng của « %.255s » (gói: "
+"%.100s)"
 
 #: src/archives.c:417
 #, c-format
 msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
-msgstr ""
-"đang thử ghi đè lên « %.255s », phiên bản đã chuyển hướng của « %.255s »"
+msgstr "đang thử ghi đè lên « %.255s », phiên bản đã chuyển hướng của « %.255s »"
 
 #: src/archives.c:440
 #, c-format
@@ -966,8 +963,7 @@ msgid ""
 "unable to clean up mess surrounding `%.255s' before installing another "
 "version"
 msgstr ""
-"không thể dọn dẹp sự lộn xộn quanh « %.255s » trước khi cài đặt phiên bản "
-"khác"
+"không thể dọn dẹp sự lộn xộn quanh « %.255s » trước khi cài đặt phiên bản khác"
 
 #: src/archives.c:454
 #, c-format
@@ -1241,8 +1237,7 @@ msgstr "gặp lỗi khi đóng ống dẫn của find (tìm)"
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr ""
-"việc find (tìm) cho « --recursive » (đệ qui) trả lại lỗi không được quản lý %"
-"i"
+"việc find (tìm) cho « --recursive » (đệ qui) trả lại lỗi không được quản lý %i"
 
 #: src/archives.c:1138
 msgid "searched, but found no packages (files matching *.deb)"
@@ -1391,8 +1386,7 @@ msgstr "dpkg: %s: cảnh báo  — lỗi gỡ bỏ bản sao lưu cũ « %.250s
 #: src/configure.c:241
 #, c-format
 msgid "dpkg: %s: warning - failed to rename `%.250s' to `%.250s': %s\n"
-msgstr ""
-"dpkg: %s: cảnh báo — lỗi thay đổi tên « %.250s » thành « %.250s »: %s\n"
+msgstr "dpkg: %s: cảnh báo — lỗi thay đổi tên « %.250s » thành « %.250s »: %s\n"
 
 #: src/configure.c:249
 #, c-format
@@ -1935,8 +1929,8 @@ msgstr "Gói %s bị giữ lại, vẫn xử lý nó như bạn yêu cầu.\n"
 msgid ""
 "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
 msgstr ""
-"Gói %s bị giữ lại nên không thao tác nó. Dùng « --force-hold » (buộc giữ "
-"lại) để đè.\n"
+"Gói %s bị giữ lại nên không thao tác nó. Dùng « --force-hold » (buộc giữ lại) "
+"để đè.\n"
 
 #: src/errors.c:123
 msgid ""
@@ -1957,8 +1951,8 @@ msgid ""
 "dpkg: serious warning: files list file for package `%.250s' missing, "
 "assuming package has no files currently installed.\n"
 msgstr ""
-"dpkg: cảnh báo trầm trọng: thiếu tập tin liệt kê nội dung gói « %.250s », "
-"giả sử gói không có tập tin hiện thời được cài đặt.\n"
+"dpkg: cảnh báo trầm trọng: thiếu tập tin liệt kê nội dung gói « %.250s », giả "
+"sử gói không có tập tin hiện thời được cài đặt.\n"
 
 #: src/filesdb.c:145
 #, c-format
@@ -3018,8 +3012,8 @@ msgid ""
 "dpkg: warning - old conffile `%.250s' was an empty directory (and has now "
 "been deleted)\n"
 msgstr ""
-"dpkg: cảnh báo — tập tin cấu hình cũ « %.250s » là thư mục trống (thì đã "
-"được xoá).\n"
+"dpkg: cảnh báo — tập tin cấu hình cũ « %.250s » là thư mục trống (thì đã được "
+"xoá).\n"
 
 #: src/processarc.c:673
 #, c-format
@@ -3078,8 +3072,8 @@ msgstr "thông tin điều khiển gói chứa thư mục « %.250s »"
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr ""
-"việc rmdir (gỡ bỏ thư mục) kiểu thông tin điều khiển gói của « %.250s » "
-"không nói « không phải là thư mục »"
+"việc rmdir (gỡ bỏ thư mục) kiểu thông tin điều khiển gói của « %.250s » không "
+"nói « không phải là thư mục »"
 
 #: src/processarc.c:808
 #, c-format
@@ -3360,8 +3354,8 @@ msgid ""
 "dpkg - warning: while removing %.250s, unable to remove directory `%.250s': %"
 "s - directory may be a mount point ?\n"
 msgstr ""
-"dpkg — cảnh báo : trong khi gỡ bỏ %.250s, không thể gỡ bỏ thư mục « %.250s "
-"»: %s — thư mục có thể là một điểm lắp không?\n"
+"dpkg — cảnh báo : trong khi gỡ bỏ %.250s, không thể gỡ bỏ thư mục « %.250s »: "
+"%s — thư mục có thể là một điểm lắp không?\n"
 
 #: src/remove.c:265 src/remove.c:382
 #, c-format
@@ -3405,8 +3399,7 @@ msgstr "không thể đọc thư mục tập tin cấu hình « %.250s » (từ
 #: src/remove.c:505
 #, c-format
 msgid "cannot remove old backup config file `%.250s' (of `%.250s')"
-msgstr ""
-"không thể gỡ bỏ tập tin cấu hình sao lưu cũ « %.250s » (của « %.250s »)"
+msgstr "không thể gỡ bỏ tập tin cấu hình sao lưu cũ « %.250s » (của « %.250s »)"
 
 #: src/remove.c:541
 #, c-format
@@ -3553,8 +3546,7 @@ msgstr ""
 #: dpkg-deb/build.c:241
 #, c-format
 msgid "warning, `%s' contains user-defined Priority value `%s'\n"
-msgstr ""
-"cảnh báo, « %s » chứa giá trị Ưu tiên « %s » được người dùng xác định\n"
+msgstr "cảnh báo, « %s » chứa giá trị Ưu tiên « %s » được người dùng xác định\n"
 
 #: dpkg-deb/build.c:249
 #, c-format
@@ -3580,8 +3572,8 @@ msgstr "thư mục điều khiển có quyền hạn sai %03lo (phải là ≥07
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr ""
-"văn lệnh nhà duy trì « %.50s » không phải là tập tin chuẩn hay liên kết "
-"tượng trưng"
+"văn lệnh nhà duy trì « %.50s » không phải là tập tin chuẩn hay liên kết tượng "
+"trÆ°ng"
 
 #: dpkg-deb/build.c:287
 #, c-format
@@ -3589,14 +3581,12 @@ msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
 "<=0775)"
 msgstr ""
-"văn lệnh nhà duy trì « %.50s » có quyền hạn sai %03lo (phải là ≥0755 và "
-"≤0775)"
+"văn lệnh nhà duy trì « %.50s » có quyền hạn sai %03lo (phải là ≥0755 và ≤0775)"
 
 #: dpkg-deb/build.c:291
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
-msgstr ""
-"văn lệnh nhà duy trì « %.50s » không có khả năng cung cấp các thông tin"
+msgstr "văn lệnh nhà duy trì « %.50s » không có khả năng cung cấp các thông tin"
 
 #: dpkg-deb/build.c:301
 msgid "empty string from fgets reading conffiles"
@@ -3607,8 +3597,8 @@ msgstr "chuỗi rỗng từ fgets đọc các tập tin cấu hình"
 msgid ""
 "warning, conffile name `%.50s...' is too long, or missing final newline\n"
 msgstr ""
-"cảnh báo, tên tập tin cấu hình « %.50s... » quá dài, hoặc thiếu dòng mới "
-"cuối cùng\n"
+"cảnh báo, tên tập tin cấu hình « %.50s... » quá dài, hoặc thiếu dòng mới cuối "
+"cùng\n"
 
 #: dpkg-deb/build.c:316
 #, c-format
@@ -3782,8 +3772,8 @@ msgstr "tập tin « %.250s » bị hỏng — chiều dài bộ phạn âm %zi"
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr ""
-"tập tin « %.250s » không phải là một kho nén nhị phân Debian (thử « dpkg-"
-"split » (chia tách)?)"
+"tập tin « %.250s » không phải là một kho nén nhị phân Debian (thử « dpkg-split "
+"» (chia tách)?)"
 
 #: dpkg-deb/extract.c:129
 msgid "header info member"
@@ -4029,8 +4019,7 @@ msgstr "lỗi đọc « control » (điều khiển) (trong « %.250s »)"
 
 #: dpkg-deb/info.c:172
 msgid "(no `control' file in control archive!)\n"
-msgstr ""
-"(không có tập tin « control » (điều khiển) trong kho lưu điều khiển!)\n"
+msgstr "(không có tập tin « control » (điều khiển) trong kho lưu điều khiển!)\n"
 
 #: dpkg-deb/info.c:192
 msgid "could not open the `control' component"
@@ -4192,8 +4181,8 @@ msgstr "tập tin « %.250s » bị hỏng — các số không ở trong phần
 #, c-format
 msgid "file `%.250s' is format version `%.250s' - you need a newer dpkg-split"
 msgstr ""
-"tập tin « %.250s » có định dạng phiên bản « %.250s » — cần « dpkg-split » "
-"mới hơn"
+"tập tin « %.250s » có định dạng phiên bản « %.250s » — cần « dpkg-split » mới "
+"hơn"
 
 #: dpkg-split/info.c:124
 #, c-format
@@ -4457,8 +4446,7 @@ msgstr "không thể mở tập tin kho chứa (depot) mới « %.250s »"
 #, c-format
 msgid "unable to rename new depot file `%.250s' to `%.250s'"
 msgstr ""
-"không thể thay đổi tên tập tin kho chứa (depot) mới « %.250s » thành « "
-"%.250s »"
+"không thể thay đổi tên tập tin kho chứa (depot) mới « %.250s » thành « %.250s »"
 
 #: dpkg-split/queue.c:162
 #, c-format
@@ -4653,7 +4641,7 @@ msgid "unable to close %s after read: %s"
 msgstr "không thể đóng %s sau khi đọc: %s"
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "không thể đóng %s: %s"
@@ -4759,7 +4747,7 @@ msgstr ""
 "« --package » và « --divert ».\n"
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr "hai lệnh đã xác định: %s và --%s"
@@ -4783,13 +4771,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:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, 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:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "không biết tùy chọn « %s »"
@@ -4888,12 +4876,12 @@ msgstr "không thể lấy các thông tin về tên cũ « %s »: %s"
 msgid "cannot stat new name `%s': %s"
 msgstr "không thể lấy các thông tin về tên mới « %s »: %s"
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "gặp lỗi khi kiểm tra « %s »: %s"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4902,47 +4890,47 @@ msgstr ""
 "« rename » cần thiết việc ghi đè « %s »\n"
 "  bằng tập tin khác « %s », không cho phép"
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "rename: gỡ bỏ liên kết cũ nhân đôi « %s »: %s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "rename: thay tên « %s » thành « %s »: %s"
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "tạo « diversions-new »: %s"
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "ghi « diversions-new »: %s"
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "đóng « diversions-new »: %s"
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "gỡ bỏ « diversions-old » cũ: %s"
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "tạo « diversions-old » mới: %s"
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "cài đặt sự chuyển hướng mới: %s"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "lỗi nội bộ : %s bị hỏng: %s"
@@ -5199,8 +5187,7 @@ msgstr "%s: « --section » (phần) bị lờ đi khi cùng với « --remove 
 #: scripts/install-info.pl:130
 #, perl-format
 msgid "%s: --description ignored with --remove"
-msgstr ""
-"%s: « --description » (mô tả) bị lờ đi khi cùng với « --remove » (gỡ bỏ)"
+msgstr "%s: « --description » (mô tả) bị lờ đi khi cùng với « --remove » (gỡ bỏ)"
 
 #: scripts/install-info.pl:133
 #, perl-format
@@ -5515,56 +5502,90 @@ msgstr "Không có phiên bản sẵn sàng."
 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:243
+#: scripts/update-alternatives.pl:232
+#, fuzzy, perl-format
+msgid ""
+"warning: %s is supposed to be a symlink to %s, \n"
+"or nonexistent; however, readlink failed: %s"
+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:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr "Đang để lại %s (%s) chỉ tới %s."
+
+#: scripts/update-alternatives.pl:247
+#, 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:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr "Đang dùng « %s » để cung cấp « %s »."
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, 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:288
+#, perl-format
+msgid "unable to remove %s: %s"
+msgstr "không thể gỡ bỏ %s: %s"
+
+#: scripts/update-alternatives.pl:301
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "không biết đối số « %s »"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 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:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr "« ưu tiên » phải là số nguyên"
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "« --%s » cần hai giá trị <tên> <đường_dẫn>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "« --%s » cần giá trị <tên>"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 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:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "tên phụ %s bị nhân đôi"
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "liên kết phụ %s bị nhân đôi"
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, 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:293
+#: scripts/update-alternatives.pl:351
 #, 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:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5579,31 +5600,21 @@ msgstr ""
 " •--remove-all \tgỡ bỏ tất cả\n"
 " •--auto\t\t\ttự động"
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr "cho phép « --slave » (phụ) chỉ với « --install » (cài đặt)"
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "Không có điều xen kẽ cho %s."
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, 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:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, perl-format
-msgid "unable to remove %s: %s"
-msgstr "không thể gỡ bỏ %s: %s"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5612,7 +5623,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:386
+#: scripts/update-alternatives.pl:442
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5623,125 +5634,69 @@ 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:392
+#: scripts/update-alternatives.pl:448
 #, 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:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, 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:414
+#: scripts/update-alternatives.pl:470
 #, 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:416
+#: scripts/update-alternatives.pl:472
 #, 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:433
+#: scripts/update-alternatives.pl:489
 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:447
+#: scripts/update-alternatives.pl:503
 #, 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:474
+#: scripts/update-alternatives.pl:530
 #, 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:495
+#: scripts/update-alternatives.pl:549
 #, 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:497
+#: scripts/update-alternatives.pl:551
 #, 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:501
+#: scripts/update-alternatives.pl:555
 #, 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:516
+#: scripts/update-alternatives.pl:569
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "không thể mở %s để ghi: %s"
 
-#: scripts/update-alternatives.pl:539
+#: scripts/update-alternatives.pl:592
 #, 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:553
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a symlink to %s\n"
-" (or nonexistent); however, readlink failed: %s"
-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:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, 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:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, 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:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, 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:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr "Đang để lại %s (%s) chỉ tới %s."
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, 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:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, 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:600
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a slave symlink to\n"
-" %s, or nonexistent; however, readlink failed: %s"
-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:634
+#: scripts/update-alternatives.pl:631
 #, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5750,7 +5705,7 @@ msgstr ""
 "Không có chương trình nào cung cấp %s\n"
 "nên không có gì cần cấu hình.\n"
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5759,7 +5714,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:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5772,46 +5727,61 @@ msgstr ""
 "  Lựa chọn    Sự xen kẽ\n"
 "━━━━━━━━━━━━━━━━━━━━━\n"
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 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:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr "Đang dùng « %s » để cung cấp « %s »."
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "Không tìm thấy điều xen kẽ « %s »."
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "gặp lỗi khi ghi thiết bị xuất: %s"
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, 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:735
+#: scripts/update-alternatives.pl:696
 #, 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:736
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "missing newline after %s"
 msgstr "thiếu ký tự dòng mới sau %s"
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, 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:715
+#, 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:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "Gặp lỗi nghiêm trọng: %s"
 
+#~ msgid "unable to ensure %s nonexistent: %s"
+#~ msgstr "không thể đảm bảo %s không tồn tại: %s"
+
+#~ msgid ""
+#~ "warning: %s is supposed to be a slave symlink to\n"
+#~ " %s, or nonexistent; however, readlink failed: %s"
+#~ 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"
+
 #~ msgid "warning"
 #~ msgstr "cảnh báo"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 16814ade..91a66139 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-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\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"
@@ -4364,7 +4364,7 @@ msgid "unable to close %s after read: %s"
 msgstr "读取完之后无法关闭 %s：%s"
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "无法关闭 %s：%s"
@@ -4452,7 +4452,7 @@ msgstr ""
 "软件包的 preinst 和 postrm 脚本通常应当指定 --package 和 --divert 选项。\n"
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, fuzzy, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr "指定了两种模式：%s 以及 --%s"
@@ -4476,13 +4476,13 @@ msgid "package may not contain newlines"
 msgstr "软件包不可以含有换行符"
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s 需要一个 <directory> 参数"
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "无法识别的选项 “%s”"
@@ -4581,12 +4581,12 @@ msgstr "无法取得旧名称 “%s” 的信息：%s"
 msgid "cannot stat new name `%s': %s"
 msgstr "无法取得新名称 “%s” 的信息：%s"
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "处理 “%s” 时发生错误：%s"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4595,47 +4595,47 @@ msgstr ""
 "更改 “%2$s” 文件名会复盖 “%1$s”，\n"
 "  不允許此操作"
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "改名：移除重复的旧连接 “%s”：%s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "改名：更改 “%s” 的名称为 “%s”：%s"
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "创建 diversions-new：%s"
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "写入 diversions-new：%s"
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "关闭 diversions-new：%s"
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "移除旧有的转移项(diversions-old)：%s"
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "创建新的 diversions-old：%s"
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "安装新的转移项：%s"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "内部错误：%s 损坏：%s"
@@ -5157,54 +5157,88 @@ msgstr "无适用版本。"
 msgid "Current `best' version is %s."
 msgstr "目前“最佳”的版本为 %s。"
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
+#, fuzzy, perl-format
+msgid ""
+"warning: %s is supposed to be a symlink to %s, \n"
+"or nonexistent; however, readlink failed: %s"
+msgstr ""
+"警告：%s 应该是指向 %s 的符号链接(symlink)\n"
+" （或者不存在），但读取链接失败：%s"
+
+#: scripts/update-alternatives.pl:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr "维持 %s（%s）指向 %s。"
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
+msgstr "正在更新 %s（%s）指向 %s。"
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr "使用 “%s” 来提供 “%s”。"
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr "正在移除 %s（%s），不适用于 %s。"
+
+#: scripts/update-alternatives.pl:288
+#, perl-format
+msgid "unable to remove %s: %s"
+msgstr "无法移除 %s：%s"
+
+#: scripts/update-alternatives.pl:301
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "无法识别的参数 “%s”"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install 需要 <link> <name> <path> <priority>"
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr "优先级必须为整数"
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s 需要 <name> <path>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s 需要 <name>"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave 需要 <link> <name> <path>"
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "次要名称(slave name) %s 有重复"
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "次要链接(slave link) %s 有重复"
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "文件名 %s 同時是主要(primary)和次要(slave)"
 
-#: scripts/update-alternatives.pl:293
+#: scripts/update-alternatives.pl:351
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "链接 %s 同時是主要(primary)和次要(slave)"
 
-#: scripts/update-alternatives.pl:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5212,31 +5246,21 @@ msgstr ""
 "需要 --display, --config, --set, --install, --remove, --all, --remove-all 或 "
 "--auto 选项"
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr "--slave 只能搭配 --install 使用"
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "无 %s 的替换项。"
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "正在设置 %s 的自動选择"
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, perl-format
-msgid "unable to remove %s: %s"
-msgstr "无法移除 %s：%s"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5245,7 +5269,7 @@ msgstr ""
 "%s 已更改（由于手动更改或通过脚本）。\n"
 "切换成只允许手动更新。"
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5254,122 +5278,66 @@ msgstr ""
 "检查 %s 的可用版本，正在更新 %s 中的链接…\n"
 "（如果愿意，你也可以自行修改符号链接 (symlink) - 请参阅 “man ln”。）"
 
-#: scripts/update-alternatives.pl:392
+#: scripts/update-alternatives.pl:448
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "正在更改链接 %s 的名称，从 %s 改成 %s。"
 
-#: scripts/update-alternatives.pl:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "无法把 %s 改名为 %s：%s"
 
-#: scripts/update-alternatives.pl:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "次要链接名称 %s 已重复"
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "正在更改次要链接 %s 的名称，从 %s 改成 %s。"
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:489
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "正在移除手动选择的替代项 - 切换为自动模式"
 
-#: scripts/update-alternatives.pl:447
+#: scripts/update-alternatives.pl:503
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "%2$s 的替换项 %1$s 没有注册，无法移除。"
 
-#: scripts/update-alternatives.pl:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "舍弃已废弃的次要链接 %s（%s）。"
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "取消 %s 的自动更新功能。"
 
-#: scripts/update-alternatives.pl:497
+#: scripts/update-alternatives.pl:551
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr "要回复成自动更新，请执行 “update-alternatives --auto %s”。"
 
-#: scripts/update-alternatives.pl:501
+#: scripts/update-alternatives.pl:555
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "正在从上一次更新 %s 的失败中恢复…"
 
-#: scripts/update-alternatives.pl:516
+#: scripts/update-alternatives.pl:569
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "无法打开文件 “%s” 以写入：%s"
 
-#: scripts/update-alternatives.pl:539
+#: scripts/update-alternatives.pl:592
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "最后一个提供 %s（%s）的软件包已移除，删除中。"
 
-#: scripts/update-alternatives.pl:553
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a symlink to %s\n"
-" (or nonexistent); however, readlink failed: %s"
-msgstr ""
-"警告：%s 应该是指向 %s 的符号链接(symlink)\n"
-" （或者不存在），但读取链接失败：%s"
-
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr "无法确认 %s 不存在：%s"
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, perl-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "无法创建 %s 为 %s 的符号链接(symlink)：%s"
-
-#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, perl-format
-msgid "unable to install %s as %s: %s"
-msgstr "无法把 %s 安装为 %s：%s"
-
-#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr "维持 %s（%s）指向 %s。"
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr "正在更新 %s（%s）指向 %s。"
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr "正在移除 %s（%s），不适用于 %s。"
-
-#: scripts/update-alternatives.pl:600
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a slave symlink to\n"
-" %s, or nonexistent; however, readlink failed: %s"
-msgstr ""
-"警告：%s 本该是指向 %s 的次要链接，\n"
-"或者不存在；但读取链接失败：%s"
-
-#: scripts/update-alternatives.pl:634
+#: scripts/update-alternatives.pl:631
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5378,7 +5346,7 @@ msgstr ""
 "只有一个程序提供 %s\n"
 "（%s）。无须做任何配置。\n"
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5387,7 +5355,7 @@ msgstr ""
 "只有一个程序提供 %s\n"
 "（%s）。无须做任何配置。\n"
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5400,45 +5368,60 @@ msgstr ""
 "    选择        可选项\n"
 "-----------------------------------------------\n"
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr "要维持缺省值[*]，按回车键，或者键入选择的编号："
 
-#: scripts/update-alternatives.pl:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr "使用 “%s” 来提供 “%s”。"
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "找不到替换项 “%s”。"
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "写入标准输出(stdout)时出错：%s"
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "update-alternatives 文件（%s）禁止换行符"
 
-#: scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:696
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "%2$s：读取 %1$s 时发生错误或是 eof （%3$s）"
 
-#: scripts/update-alternatives.pl:736
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "missing newline after %s"
 msgstr "在 %s 后缺少换行符"
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, perl-format
+msgid "unable to make %s a symlink to %s: %s"
+msgstr "无法创建 %s 为 %s 的符号链接(symlink)：%s"
+
+#: scripts/update-alternatives.pl:715
+#, perl-format
+msgid "unable to install %s as %s: %s"
+msgstr "无法把 %s 安装为 %s：%s"
+
+#: scripts/update-alternatives.pl:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "严重问题：%s"
 
+#~ msgid "unable to ensure %s nonexistent: %s"
+#~ msgstr "无法确认 %s 不存在：%s"
+
+#~ msgid ""
+#~ "warning: %s is supposed to be a slave symlink to\n"
+#~ " %s, or nonexistent; however, readlink failed: %s"
+#~ msgstr ""
+#~ "警告：%s 本该是指向 %s 的次要链接，\n"
+#~ "或者不存在；但读取链接失败：%s"
+
 #~ msgid "warning"
 #~ msgstr "警告"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index fb0ccf87..23d1e8f0 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-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\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"
@@ -4359,7 +4359,7 @@ msgid "unable to close %s after read: %s"
 msgstr "讀取完畢：%s 後，無法關閉該檔案 %s"
 
 #: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
-#: scripts/update-alternatives.pl:535
+#: scripts/update-alternatives.pl:588
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr "無法關閉 %s：%s"
@@ -4450,7 +4450,7 @@ msgstr ""
 "divert.\n"
 
 #: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
-#: scripts/update-alternatives.pl:229
+#: scripts/update-alternatives.pl:281
 #, fuzzy, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr "指定兩種模式：%s 以及 --%s"
@@ -4474,13 +4474,13 @@ msgid "package may not contain newlines"
 msgstr "套件可能不含有新的行數"
 
 #: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
-#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
+#: scripts/update-alternatives.pl:336 scripts/update-alternatives.pl:339
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr "--%s 需要一個<目錄名>作為參數"
 
 #: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
-#: scripts/update-alternatives.pl:286
+#: scripts/update-alternatives.pl:344
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "無法識別的選項“%s”"
@@ -4579,12 +4579,12 @@ msgstr "無法取得舊名稱“%s”的資訊：%s"
 msgid "cannot stat new name `%s': %s"
 msgstr "無法取得新名稱“%s”的資訊：%s"
 
-#: scripts/dpkg-divert.pl:247
+#: scripts/dpkg-divert.pl:246 scripts/dpkg-divert.pl:253
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr "處理“%s”時發生錯誤：%s"
 
-#: scripts/dpkg-divert.pl:252
+#: scripts/dpkg-divert.pl:257
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
@@ -4593,47 +4593,47 @@ msgstr ""
 "更改“%2$s”檔名會複寫“%1$s”，\n"
 "不允許此操作"
 
-#: scripts/dpkg-divert.pl:262
+#: scripts/dpkg-divert.pl:267
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr "更名：移除重覆的舊鏈結“%s”：%s"
 
-#: scripts/dpkg-divert.pl:264
+#: scripts/dpkg-divert.pl:269
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr "更名：更名“%s”為“%s”：%s"
 
-#: scripts/dpkg-divert.pl:271
+#: scripts/dpkg-divert.pl:276
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr "建立diversions-new：%s"
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:280
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr "寫入diversions-new：%s"
 
-#: scripts/dpkg-divert.pl:277
+#: scripts/dpkg-divert.pl:282
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr "關閉diversions-new：%s"
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:284
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr "移除舊有的轉移項目(diversions-old)：%s"
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:286
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr "建立新的diversions-old：%s"
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:288
 #, perl-format
 msgid "install new diversions: %s"
 msgstr "安裝新的轉移項目(diversions)：%s"
 
-#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:740
+#: scripts/dpkg-divert.pl:311 scripts/update-alternatives.pl:702
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "內部錯誤：%s 損毀：%s"
@@ -5160,54 +5160,88 @@ msgstr "無任何版本。"
 msgid "Current `best' version is %s."
 msgstr "目前“最佳”的版本 %s"
 
-#: scripts/update-alternatives.pl:243
+#: scripts/update-alternatives.pl:232
+#, fuzzy, perl-format
+msgid ""
+"warning: %s is supposed to be a symlink to %s, \n"
+"or nonexistent; however, readlink failed: %s"
+msgstr ""
+"警告：%s可能是%s的鏈結\n"
+"(或者不存在)；讀取鏈結失敗：%s"
+
+#: scripts/update-alternatives.pl:244
+#, perl-format
+msgid "Leaving %s (%s) pointing to %s."
+msgstr "Leaving %s (%s) pointing to %s."
+
+#: scripts/update-alternatives.pl:247
+#, perl-format
+msgid "Updating %s (%s) to point to %s."
+msgstr "正在更新 %s(%s)並指向 %s。"
+
+#: scripts/update-alternatives.pl:256
+#, fuzzy, perl-format
+msgid "Using '%s' to provide '%s'."
+msgstr "以“%1s”取代 “%2s”"
+
+#: scripts/update-alternatives.pl:270 scripts/update-alternatives.pl:616
+#, perl-format
+msgid "Removing %s (%s), not appropriate with %s."
+msgstr "正在移除 %s(%s)中，不適用於%s。"
+
+#: scripts/update-alternatives.pl:288
+#, perl-format
+msgid "unable to remove %s: %s"
+msgstr "無法移除 %s：%s"
+
+#: scripts/update-alternatives.pl:301
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr "無法識別參數“%s”"
 
-#: scripts/update-alternatives.pl:256
+#: scripts/update-alternatives.pl:314
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr "--install 需要 <link> <name> <path> <priority>"
 
-#: scripts/update-alternatives.pl:258
+#: scripts/update-alternatives.pl:316
 msgid "priority must be an integer"
 msgstr "優先權必須是數字"
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:320
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr "--%s 需要名稱<name> 路徑<path>"
 
-#: scripts/update-alternatives.pl:267
+#: scripts/update-alternatives.pl:325
 #, perl-format
 msgid "--%s needs <name>"
 msgstr "--%s 需要 <參數>"
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:329
 msgid "--slave needs <link> <name> <path>"
 msgstr "--slave 需有 <link> <name> <path>"
 
-#: scripts/update-alternatives.pl:273
+#: scripts/update-alternatives.pl:331
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr "次要名稱 %s 已重覆"
 
-#: scripts/update-alternatives.pl:274
+#: scripts/update-alternatives.pl:332
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr "次要鏈結 %s 已重覆"
 
-#: scripts/update-alternatives.pl:291
+#: scripts/update-alternatives.pl:349
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr "檔名 %s 是主要也是次要"
 
-#: scripts/update-alternatives.pl:293
+#: scripts/update-alternatives.pl:351
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr "鏈結 %s 是主要也是次要"
 
-#: scripts/update-alternatives.pl:296
+#: scripts/update-alternatives.pl:354
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
@@ -5215,31 +5249,21 @@ msgstr ""
 "需要 --display, --config, --set, --install, --remove, --all, --remove-all 或 "
 "--auto 選項"
 
-#: scripts/update-alternatives.pl:298
+#: scripts/update-alternatives.pl:356
 msgid "--slave only allowed with --install"
 msgstr "--slave 只能搭配 --install 使用"
 
-#: scripts/update-alternatives.pl:311
+#: scripts/update-alternatives.pl:369
 #, perl-format
 msgid "No alternatives for %s."
 msgstr "無 %s 的替換檔案。"
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr "正在設定 %s 的自選功能。"
 
-#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
-#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
-#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
-#: scripts/update-alternatives.pl:687 scripts/update-alternatives.pl:723
-#, perl-format
-msgid "unable to remove %s: %s"
-msgstr "無法移除 %s：%s"
-
-#: scripts/update-alternatives.pl:374
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
@@ -5248,7 +5272,7 @@ msgstr ""
 "%s 已更動(手動更改或透過script)。\n"
 "切換成手動更新。"
 
-#: scripts/update-alternatives.pl:386
+#: scripts/update-alternatives.pl:442
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
@@ -5257,122 +5281,66 @@ msgstr ""
 "檢查 %s 可安裝的版本，更新 %s 鏈結中…\n"
 "(你也可以依照自已的喜好來修改鏈結 - 請參閱“man ln”。)"
 
-#: scripts/update-alternatives.pl:392
+#: scripts/update-alternatives.pl:448
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "正在更名 %s 鏈結，%s 更名成 %s。"
 
-#: scripts/update-alternatives.pl:395 scripts/update-alternatives.pl:419
-#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
+#: scripts/update-alternatives.pl:451 scripts/update-alternatives.pl:475
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "%s無法更名成%s：%s"
 
-#: scripts/update-alternatives.pl:414
+#: scripts/update-alternatives.pl:470
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr "次要鏈結名稱 %s 已重覆"
 
-#: scripts/update-alternatives.pl:416
+#: scripts/update-alternatives.pl:472
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr "%s 次要鏈結更名中，%s 更名為 %s"
 
-#: scripts/update-alternatives.pl:433
+#: scripts/update-alternatives.pl:489
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr "移除手動選擇的替代指令 - 切換為自動模式"
 
-#: scripts/update-alternatives.pl:447
+#: scripts/update-alternatives.pl:503
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr "%2$s 的替換項目 %1$s 沒有註冊，無法移除。"
 
-#: scripts/update-alternatives.pl:474
+#: scripts/update-alternatives.pl:530
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr "捨棄無效的鏈結 %s(%s)。"
 
-#: scripts/update-alternatives.pl:495
+#: scripts/update-alternatives.pl:549
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr "取消 %s 自動更新功能。"
 
-#: scripts/update-alternatives.pl:497
+#: scripts/update-alternatives.pl:551
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr "要回復成自動更新，執行“update-alternatives --auto %s”。"
 
-#: scripts/update-alternatives.pl:501
+#: scripts/update-alternatives.pl:555
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr "%s 回復成更新前的狀態…"
 
-#: scripts/update-alternatives.pl:516
+#: scripts/update-alternatives.pl:569
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "無法開啟 %s 檔案以供寫入：%s"
 
-#: scripts/update-alternatives.pl:539
+#: scripts/update-alternatives.pl:592
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr "最後一個提供 %s(%s) 的套件已移除，刪除中。"
 
-#: scripts/update-alternatives.pl:553
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a symlink to %s\n"
-" (or nonexistent); however, readlink failed: %s"
-msgstr ""
-"警告：%s可能是%s的鏈結\n"
-"(或者不存在)；讀取鏈結失敗：%s"
-
-#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:573
-#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:607
-#, perl-format
-msgid "unable to ensure %s nonexistent: %s"
-msgstr "無法確認%s是否存在：%s"
-
-#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:610
-#: scripts/update-alternatives.pl:624 scripts/update-alternatives.pl:673
-#: scripts/update-alternatives.pl:709 scripts/update-alternatives.pl:748
-#, perl-format
-msgid "unable to make %s a symlink to %s: %s"
-msgstr "無法建立 %2s 的鏈結 %1s：%3s"
-
-#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:583
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:626
-#: scripts/update-alternatives.pl:675 scripts/update-alternatives.pl:711
-#: scripts/update-alternatives.pl:753
-#, perl-format
-msgid "unable to install %s as %s: %s"
-msgstr "無法把“%s”安裝到“%s”：%s"
-
-#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:617
-#, perl-format
-msgid "Leaving %s (%s) pointing to %s."
-msgstr "Leaving %s (%s) pointing to %s."
-
-#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:620
-#, perl-format
-msgid "Updating %s (%s) to point to %s."
-msgstr "正在更新 %s(%s)並指向 %s。"
-
-#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:684
-#: scripts/update-alternatives.pl:720
-#, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
-msgstr "正在移除 %s(%s)中，不適用於%s。"
-
-#: scripts/update-alternatives.pl:600
-#, perl-format
-msgid ""
-"warning: %s is supposed to be a slave symlink to\n"
-" %s, or nonexistent; however, readlink failed: %s"
-msgstr ""
-"警告：%s可能是%s的次要鏈結\n"
-"，或者不存在；讀取鏈結失敗：%s"
-
-#: scripts/update-alternatives.pl:634
+#: scripts/update-alternatives.pl:631
 #, fuzzy, perl-format
 msgid ""
 "There is no program which provides %s.\n"
@@ -5381,7 +5349,7 @@ msgstr ""
 "只有一個程式提供 %s\n"
 "(%s)。無須做任何設定。\n"
 
-#: scripts/update-alternatives.pl:640
+#: scripts/update-alternatives.pl:637
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
@@ -5390,7 +5358,7 @@ msgstr ""
 "只有一個程式提供 %s\n"
 "(%s)。無須做任何設定。\n"
 
-#: scripts/update-alternatives.pl:645
+#: scripts/update-alternatives.pl:642
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5403,45 +5371,60 @@ msgstr ""
 "  可使用的替換項目\n"
 "===========================\n"
 
-#: scripts/update-alternatives.pl:655
+#: scripts/update-alternatives.pl:652
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr "按下 enter 來指定預設選項[*]，或者輸入選擇的號碼："
 
-#: scripts/update-alternatives.pl:670 scripts/update-alternatives.pl:707
-#, perl-format
-msgid "Using `%s' to provide `%s'."
-msgstr "以“%1s”取代 “%2s”"
-
-#: scripts/update-alternatives.pl:705
+#: scripts/update-alternatives.pl:684
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr "找不到替換檔案“%s”。"
 
-#: scripts/update-alternatives.pl:728 scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:689 scripts/update-alternatives.pl:692
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr "%s寫入錯誤"
 
-#: scripts/update-alternatives.pl:730
+#: scripts/update-alternatives.pl:691
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr "newlines prohibited in update-alternatives files (%s)"
 
-#: scripts/update-alternatives.pl:735
+#: scripts/update-alternatives.pl:696
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "%2$s：發生錯誤或是讀到檔案%1$s尾端(%3$s)"
 
-#: scripts/update-alternatives.pl:736
+#: scripts/update-alternatives.pl:698
 #, perl-format
 msgid "missing newline after %s"
 msgstr "在%s後沒有發現換行字元"
 
-#: scripts/update-alternatives.pl:756
+#: scripts/update-alternatives.pl:710
+#, perl-format
+msgid "unable to make %s a symlink to %s: %s"
+msgstr "無法建立 %2s 的鏈結 %1s：%3s"
+
+#: scripts/update-alternatives.pl:715
+#, perl-format
+msgid "unable to install %s as %s: %s"
+msgstr "無法把“%s”安裝到“%s”：%s"
+
+#: scripts/update-alternatives.pl:718
 #, perl-format
 msgid "Serious problem: %s"
 msgstr "嚴重的問題：%s"
 
+#~ msgid "unable to ensure %s nonexistent: %s"
+#~ msgstr "無法確認%s是否存在：%s"
+
+#~ msgid ""
+#~ "warning: %s is supposed to be a slave symlink to\n"
+#~ " %s, or nonexistent; however, readlink failed: %s"
+#~ msgstr ""
+#~ "警告：%s可能是%s的次要鏈結\n"
+#~ "，或者不存在；讀取鏈結失敗：%s"
+
 #~ msgid "warning"
 #~ msgstr "警告"
 
diff --git a/scripts/po/ChangeLog b/scripts/po/ChangeLog
index 1e901266..c6193d2c 100644
--- a/scripts/po/ChangeLog
+++ b/scripts/po/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-29  Guillem Jover  <guillem@debian.org>
+
+	* dpkg-dev.pot: Regenerated.
+	* *.po: Merged with dpkg-dev.pot.
+
 2007-12-17  Helge Kreutzmann  <debian@helgefjell.de>
 
 	* de.po: Updated to 255t0f227u.
diff --git a/scripts/po/ca.po b/scripts/po/ca.po
index 1d6b2e67..28fa3e8b 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-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\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"
@@ -112,8 +112,8 @@ msgstr ""
 msgid "fork for parse changelog"
 msgstr ""
 
-#: scripts/controllib.pl:191 scripts/dpkg-genchanges.pl:305
-#: scripts/dpkg-gencontrol.pl:220 scripts/dpkg-source.pl:380
+#: scripts/controllib.pl:191 scripts/dpkg-genchanges.pl:306
+#: scripts/dpkg-gencontrol.pl:220 scripts/dpkg-source.pl:381
 msgid "parsed version of changelog"
 msgstr ""
 
@@ -185,11 +185,11 @@ msgid "syntax error in %s at line %d: %s"
 msgstr ""
 
 #: scripts/dpkg-architecture.pl:35 scripts/dpkg-buildpackage.pl:21
-#: scripts/dpkg-distaddfile.pl:21 scripts/dpkg-genchanges.pl:82
+#: scripts/dpkg-distaddfile.pl:21 scripts/dpkg-genchanges.pl:83
 #: scripts/dpkg-gencontrol.pl:50 scripts/dpkg-gensymbols.pl:36
 #: scripts/dpkg-parsechangelog.pl:24 scripts/dpkg-scanpackages.pl:51
-#: scripts/dpkg-scansources.pl:96 scripts/dpkg-shlibdeps.pl:357
-#: scripts/dpkg-source.pl:138 scripts/changelog/debian.pl:31
+#: scripts/dpkg-scansources.pl:96 scripts/dpkg-shlibdeps.pl:359
+#: scripts/dpkg-source.pl:139 scripts/changelog/debian.pl:31
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s versió %s.\n"
@@ -205,10 +205,10 @@ msgstr ""
 "Copyright © 2004-2005 Scott James Remnant <scott@netsplit.com>."
 
 #: scripts/dpkg-architecture.pl:41 scripts/dpkg-buildpackage.pl:28
-#: scripts/dpkg-distaddfile.pl:26 scripts/dpkg-genchanges.pl:88
+#: scripts/dpkg-distaddfile.pl:26 scripts/dpkg-genchanges.pl:89
 #: scripts/dpkg-gencontrol.pl:56 scripts/dpkg-gensymbols.pl:42
-#: scripts/dpkg-parsechangelog.pl:30 scripts/dpkg-shlibdeps.pl:366
-#: scripts/dpkg-source.pl:143 scripts/changelog/debian.pl:35
+#: scripts/dpkg-parsechangelog.pl:30 scripts/dpkg-shlibdeps.pl:368
+#: scripts/dpkg-source.pl:144 scripts/changelog/debian.pl:35
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -242,9 +242,9 @@ msgid ""
 msgstr ""
 
 #: scripts/dpkg-architecture.pl:120 scripts/dpkg-distaddfile.pl:54
-#: scripts/dpkg-genchanges.pl:177 scripts/dpkg-gencontrol.pl:129
+#: scripts/dpkg-genchanges.pl:178 scripts/dpkg-gencontrol.pl:129
 #: scripts/dpkg-gensymbols.pl:108 scripts/dpkg-shlibdeps.pl:82
-#: scripts/dpkg-source.pl:268 scripts/changelog/debian.pl:64
+#: scripts/dpkg-source.pl:269 scripts/changelog/debian.pl:64
 #, perl-format
 msgid "unknown option `%s'"
 msgstr ""
@@ -476,7 +476,7 @@ msgid "%s: Build conflicts: "
 msgstr "%s: Conflictes de construcció: "
 
 #: scripts/dpkg-checkbuilddeps.pl:157 scripts/dpkg-gencontrol.pl:261
-#: scripts/dpkg-gencontrol.pl:268 scripts/dpkg-source.pl:319
+#: scripts/dpkg-gencontrol.pl:268 scripts/dpkg-source.pl:320
 #, perl-format
 msgid "error occurred while parsing %s"
 msgstr "s'ha produït un error en analitzar %s"
@@ -532,7 +532,7 @@ msgstr ""
 msgid "close new files list file"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:84
+#: scripts/dpkg-genchanges.pl:85
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson.\n"
@@ -542,7 +542,7 @@ msgstr ""
 "Copyright © 1996 Ian Jackson.\n"
 "Copyright © 2000, 2001 Wichert Akkerman."
 
-#: scripts/dpkg-genchanges.pl:96
+#: scripts/dpkg-genchanges.pl:97
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...]\n"
@@ -574,165 +574,165 @@ msgid ""
 "      --version            show the version.\n"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:129 scripts/dpkg-genchanges.pl:132
-#: scripts/dpkg-genchanges.pl:136 scripts/dpkg-genchanges.pl:140
+#: scripts/dpkg-genchanges.pl:130 scripts/dpkg-genchanges.pl:133
+#: scripts/dpkg-genchanges.pl:137 scripts/dpkg-genchanges.pl:141
 #, fuzzy, perl-format
 msgid "cannot combine %s and -S"
 msgstr "no es pot combinar -b o -B amb -S"
 
-#: scripts/dpkg-genchanges.pl:134
+#: scripts/dpkg-genchanges.pl:135
 #, perl-format
 msgid "%s: arch-specific upload - not including arch-independent packages"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:138
+#: scripts/dpkg-genchanges.pl:139
 #, perl-format
 msgid "%s: arch-indep upload - not including arch-specific packages"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:185
+#: scripts/dpkg-genchanges.pl:186
 msgid "cannot read files list file"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:189
+#: scripts/dpkg-genchanges.pl:190
 #, perl-format
 msgid "duplicate files list entry for package %s (line %d)"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:197 scripts/dpkg-genchanges.pl:211
+#: scripts/dpkg-genchanges.pl:198 scripts/dpkg-genchanges.pl:212
 #, perl-format
 msgid "duplicate files list entry for file %s (line %d)"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:217
+#: scripts/dpkg-genchanges.pl:218
 #, perl-format
 msgid "badly formed line in files list file, line %d"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:238 scripts/dpkg-gencontrol.pl:174
-#: scripts/dpkg-source.pl:327
+#: scripts/dpkg-genchanges.pl:239 scripts/dpkg-gencontrol.pl:174
+#: scripts/dpkg-source.pl:328
 msgid "general section of control info file"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:249
+#: scripts/dpkg-genchanges.pl:250
 #, perl-format
 msgid "package %s in control file but not in files list"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:292 scripts/dpkg-gencontrol.pl:205
-#: scripts/dpkg-source.pl:367
+#: scripts/dpkg-genchanges.pl:293 scripts/dpkg-gencontrol.pl:205
+#: scripts/dpkg-source.pl:368
 msgid "package's section of control info file"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:316
+#: scripts/dpkg-genchanges.pl:317
 msgid "read changesdescription"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:327
+#: scripts/dpkg-genchanges.pl:328
 #, perl-format
 msgid "package %s listed in files list but not in control info"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:339
+#: scripts/dpkg-genchanges.pl:340
 #, perl-format
 msgid "missing Section for binary package %s; using '-'"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:341
+#: scripts/dpkg-genchanges.pl:342
 #, perl-format
 msgid "package %s has section %s in control file but %s in files list"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:348
+#: scripts/dpkg-genchanges.pl:349
 #, perl-format
 msgid "missing Priority for binary package %s; using '-'"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:350
+#: scripts/dpkg-genchanges.pl:351
 #, perl-format
 msgid "package %s has priority %s in control file but %s in files list"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:365
+#: scripts/dpkg-genchanges.pl:366
 msgid "missing Section for source files"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:370
+#: scripts/dpkg-genchanges.pl:371
 msgid "missing Priority for source files"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:375
+#: scripts/dpkg-genchanges.pl:376
 #, fuzzy, perl-format
 msgid "cannot open .dsc file %s"
 msgstr "no es pot combinar -b o -B amb -S"
 
-#: scripts/dpkg-genchanges.pl:378 scripts/dpkg-source.pl:824
+#: scripts/dpkg-genchanges.pl:379 scripts/dpkg-source.pl:833
 #, perl-format
 msgid "source control file %s"
 msgstr "fitxer de control font %s"
 
-#: scripts/dpkg-genchanges.pl:384 scripts/dpkg-source.pl:863
+#: scripts/dpkg-genchanges.pl:385 scripts/dpkg-source.pl:872
 #, perl-format
 msgid "Files field contains bad line `%s'"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:396
+#: scripts/dpkg-genchanges.pl:397
 msgid "not including original source code in upload"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:401
+#: scripts/dpkg-genchanges.pl:402
 msgid "ignoring -sd option for native Debian package"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:403
+#: scripts/dpkg-genchanges.pl:404
 msgid "including full source code in upload"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:406
+#: scripts/dpkg-genchanges.pl:407
 msgid "binary-only upload - not including any source code"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:410
+#: scripts/dpkg-genchanges.pl:411
 msgid "write original source message"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:440
+#: scripts/dpkg-genchanges.pl:441
 #, perl-format
 msgid "cannot open upload file %s for reading"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:441
+#: scripts/dpkg-genchanges.pl:442
 #, perl-format
 msgid "cannot fstat upload file %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:443
+#: scripts/dpkg-genchanges.pl:444
 #, perl-format
 msgid "upload file %s is empty"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:445
+#: scripts/dpkg-genchanges.pl:446
 #, perl-format
 msgid "md5sum upload file %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:447
+#: scripts/dpkg-genchanges.pl:448
 #, perl-format
 msgid "md5sum upload file %s gave strange output `%s'"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:451
+#: scripts/dpkg-genchanges.pl:452
 #, perl-format
 msgid "md5sum of source file %s (%s) is different from md5sum in %s (%s)"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:466 scripts/dpkg-source.pl:396
+#: scripts/dpkg-genchanges.pl:467 scripts/dpkg-source.pl:397
 #, perl-format
 msgid "missing information for critical output field %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:471 scripts/dpkg-gencontrol.pl:278
-#: scripts/dpkg-gencontrol.pl:281 scripts/dpkg-source.pl:400
+#: scripts/dpkg-genchanges.pl:472 scripts/dpkg-gencontrol.pl:278
+#: scripts/dpkg-gencontrol.pl:281 scripts/dpkg-source.pl:401
 #, perl-format
 msgid "missing information for output field %s"
 msgstr "manca informació per al camp d'eixida %s"
@@ -797,7 +797,7 @@ msgid ""
 "list (%s)"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:224 scripts/dpkg-source.pl:384
+#: scripts/dpkg-gencontrol.pl:224 scripts/dpkg-source.pl:385
 #, perl-format
 msgid "value from nowhere, with key >%s< and value >%s<"
 msgstr ""
@@ -1270,7 +1270,7 @@ msgstr ""
 msgid "need at least one executable"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:115
+#: scripts/dpkg-shlibdeps.pl:116
 #, perl-format
 msgid ""
 "couldn't find library %s needed by %s (its RPATH is '%s').\n"
@@ -1280,47 +1280,47 @@ msgid ""
 "LD_LIBRARY_PATH."
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:198
+#: scripts/dpkg-shlibdeps.pl:200
 #, perl-format
 msgid "no dependency information found for %s (used by %s)."
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:238
+#: scripts/dpkg-shlibdeps.pl:240
 #, perl-format
 msgid "symbol %s used by %s found in none of the libraries."
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:251
+#: scripts/dpkg-shlibdeps.pl:253
 #, perl-format
 msgid "%d other similar warnings have been skipped (use -v to see them all)."
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:271
+#: scripts/dpkg-shlibdeps.pl:273
 #, perl-format
 msgid "%s shouldn't be linked with %s (it uses none of its symbols)."
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:283
+#: scripts/dpkg-shlibdeps.pl:285
 #, perl-format
 msgid "open new substvars file `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:286
+#: scripts/dpkg-shlibdeps.pl:288
 #, perl-format
 msgid "open old varlist file `%s' for reading"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:289
+#: scripts/dpkg-shlibdeps.pl:291
 #, perl-format
 msgid "copy old entry to new varlist file `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:349
+#: scripts/dpkg-shlibdeps.pl:351
 #, perl-format
 msgid "install new varlist file `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:359
+#: scripts/dpkg-shlibdeps.pl:361
 #, fuzzy
 msgid ""
 "\n"
@@ -1333,7 +1333,7 @@ msgstr ""
 "Copyright © 1996 Ian Jackson.\n"
 "Copyright © 2000, 2001 Wichert Akkerman."
 
-#: scripts/dpkg-shlibdeps.pl:374
+#: scripts/dpkg-shlibdeps.pl:376
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <executable>|-e<executable> [<option> ...]\n"
@@ -1358,27 +1358,27 @@ msgid ""
 "  %s\n"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:481
+#: scripts/dpkg-shlibdeps.pl:485
 #, perl-format
 msgid "Can't extract name and version from library name `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:488
+#: scripts/dpkg-shlibdeps.pl:492
 #, perl-format
 msgid "unable to open shared libs info file `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:494
+#: scripts/dpkg-shlibdeps.pl:498
 #, perl-format
 msgid "shared libs info file `%s' line %d: bad line `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:535
+#: scripts/dpkg-shlibdeps.pl:539
 #, fuzzy, perl-format
 msgid "cannot open file %s"
 msgstr "no es pot combinar -b o -B amb -S"
 
-#: scripts/dpkg-shlibdeps.pl:568
+#: scripts/dpkg-shlibdeps.pl:572
 #, perl-format
 msgid ""
 "$ORIGIN is used in RPATH of %s and the corresponding directory could not be "
@@ -1386,34 +1386,34 @@ msgid ""
 "build tree"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:615
+#: scripts/dpkg-shlibdeps.pl:619
 msgid "cannot fork for dpkg --search"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:622
+#: scripts/dpkg-shlibdeps.pl:626
 msgid "cannot exec dpkg"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:627
+#: scripts/dpkg-shlibdeps.pl:631
 msgid "diversions involved - output may be incorrect"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:629
+#: scripts/dpkg-shlibdeps.pl:633
 msgid "write diversion info to stderr"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:633
+#: scripts/dpkg-shlibdeps.pl:637
 #, perl-format
 msgid "unknown output from dpkg --search: '%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:140
+#: scripts/dpkg-source.pl:141
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson and Klee Dienes."
 msgstr ""
 
-#: scripts/dpkg-source.pl:151
+#: scripts/dpkg-source.pl:152
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -1462,883 +1462,883 @@ msgid ""
 "      --version            show the version.\n"
 msgstr ""
 
-#: scripts/dpkg-source.pl:220
+#: scripts/dpkg-source.pl:221
 #, perl-format
 msgid "%s is not a supported compression"
 msgstr ""
 
-#: scripts/dpkg-source.pl:224
+#: scripts/dpkg-source.pl:225
 #, perl-format
 msgid "%s is not a compression level"
 msgstr ""
 
-#: scripts/dpkg-source.pl:227
+#: scripts/dpkg-source.pl:228
 #, perl-format
 msgid "-s%s option overrides earlier -s%s option"
 msgstr ""
 
-#: scripts/dpkg-source.pl:272
+#: scripts/dpkg-source.pl:273
 msgid "need -x or -b"
 msgstr ""
 
-#: scripts/dpkg-source.pl:280
+#: scripts/dpkg-source.pl:281
 #, perl-format
 msgid "source handling style -s%s not allowed with -b"
 msgstr ""
 
-#: scripts/dpkg-source.pl:283
+#: scripts/dpkg-source.pl:284
 msgid "-b needs a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:284
+#: scripts/dpkg-source.pl:285
 msgid "-b takes at most a directory and an orig source argument"
 msgstr ""
 
-#: scripts/dpkg-source.pl:287
+#: scripts/dpkg-source.pl:288
 #, perl-format
 msgid "cannot stat directory %s: %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:288
+#: scripts/dpkg-source.pl:289
 #, perl-format
 msgid "directory argument %s is not a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:346
+#: scripts/dpkg-source.pl:347
 #, perl-format
 msgid "`%s' is not a legal architecture string"
 msgstr ""
 
-#: scripts/dpkg-source.pl:349
+#: scripts/dpkg-source.pl:350
 #, perl-format
 msgid "architecture %s only allowed on its own (list for package %s is `%s')"
 msgstr ""
 
-#: scripts/dpkg-source.pl:402
+#: scripts/dpkg-source.pl:403
 msgid "unable to determine source package name !"
 msgstr ""
 
-#: scripts/dpkg-source.pl:423
+#: scripts/dpkg-source.pl:424
 #, perl-format
-msgid "cannot stat orig argument %s: %s"
+msgid "packed orig `%s' exists but is not a plain file"
 msgstr ""
 
 #: scripts/dpkg-source.pl:429
 #, perl-format
+msgid "unable to stat putative packed orig `%s'"
+msgstr ""
+
+#: scripts/dpkg-source.pl:439
+#, perl-format
+msgid "cannot stat orig argument %s: %s"
+msgstr ""
+
+#: scripts/dpkg-source.pl:445
+#, perl-format
 msgid ""
 "orig argument is unpacked but source handling style -s%s calls for packed (."
 "orig.tar.<ext>)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:436
+#: scripts/dpkg-source.pl:452
 #, perl-format
 msgid ""
 "orig argument is packed but source handling style -s%s calls for unpacked (."
 "orig/)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:445
+#: scripts/dpkg-source.pl:461
 #, perl-format
 msgid ""
 "orig argument is empty (means no orig, no diff) but source handling style -s%"
 "s wants something"
 msgstr ""
 
-#: scripts/dpkg-source.pl:453
-#, perl-format
-msgid "packed orig `%s' exists but is not a plain file"
-msgstr ""
-
-#: scripts/dpkg-source.pl:459
-#, perl-format
-msgid "unable to stat putative packed orig `%s'"
-msgstr ""
-
-#: scripts/dpkg-source.pl:464
+#: scripts/dpkg-source.pl:473
 #, perl-format
 msgid "unpacked orig `%s' exists but is not a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:468
+#: scripts/dpkg-source.pl:477
 #, perl-format
 msgid "unable to stat putative unpacked orig `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:480
+#: scripts/dpkg-source.pl:489
 #, perl-format
 msgid "source directory '%s' is not <sourcepackage>-<upstreamversion> '%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:494
+#: scripts/dpkg-source.pl:503
 #, perl-format
 msgid ".orig directory name %s is not <package>-<upstreamversion> (wanted %s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:503
+#: scripts/dpkg-source.pl:512
 #, perl-format
 msgid ""
 ".orig.tar name %s is not <package>_<upstreamversion>.orig.tar (wanted %s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:516
+#: scripts/dpkg-source.pl:525
 #, perl-format
 msgid ""
 "tarfile `%s' already exists, not overwriting, giving up; use -sU or -sR to "
 "override"
 msgstr ""
 
-#: scripts/dpkg-source.pl:519
+#: scripts/dpkg-source.pl:528
 #, perl-format
 msgid "unable to check for existence of `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:522 scripts/dpkg-source.pl:592
-#: scripts/dpkg-source.pl:752
+#: scripts/dpkg-source.pl:531 scripts/dpkg-source.pl:601
+#: scripts/dpkg-source.pl:761
 #, perl-format
 msgid "%s: building %s in %s"
 msgstr "%s: s'està construint %s a %s"
 
-#: scripts/dpkg-source.pl:524
+#: scripts/dpkg-source.pl:533
 msgid "write building tar message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:528
+#: scripts/dpkg-source.pl:537
 msgid "fork for tar"
 msgstr ""
 
-#: scripts/dpkg-source.pl:531
+#: scripts/dpkg-source.pl:540
 #, perl-format
 msgid "chdir to above (orig) source %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:532
+#: scripts/dpkg-source.pl:541
 msgid "reopen gzip for tar"
 msgstr ""
 
-#: scripts/dpkg-source.pl:534
+#: scripts/dpkg-source.pl:543
 msgid "exec tar"
 msgstr ""
 
-#: scripts/dpkg-source.pl:538
+#: scripts/dpkg-source.pl:547
 msgid "wait for tar"
 msgstr ""
 
-#: scripts/dpkg-source.pl:541 scripts/dpkg-source.pl:713
+#: scripts/dpkg-source.pl:550 scripts/dpkg-source.pl:722
 #, perl-format
 msgid "unable to rename `%s' (newly created) to `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:544 scripts/dpkg-source.pl:716
+#: scripts/dpkg-source.pl:553 scripts/dpkg-source.pl:725
 #, perl-format
 msgid "unable to change permission of `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:548
+#: scripts/dpkg-source.pl:557
 #, perl-format
 msgid "%s: building %s using existing %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:550
+#: scripts/dpkg-source.pl:559
 msgid "write using existing tar message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:560
+#: scripts/dpkg-source.pl:569
 #, perl-format
 msgid ""
 "orig dir `%s' already exists, not overwriting, giving up; use -sA, -sK or -"
 "sP to override"
 msgstr ""
 
-#: scripts/dpkg-source.pl:567
+#: scripts/dpkg-source.pl:576
 #, perl-format
 msgid "unable to check for existence of orig dir `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:577 scripts/dpkg-source.pl:938
+#: scripts/dpkg-source.pl:586 scripts/dpkg-source.pl:947
 #, perl-format
 msgid "unable to create `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:581 scripts/dpkg-source.pl:919
-#: scripts/dpkg-source.pl:942
+#: scripts/dpkg-source.pl:590 scripts/dpkg-source.pl:928
+#: scripts/dpkg-source.pl:951
 #, perl-format
 msgid "unable to rename `%s' to `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:585 scripts/dpkg-source.pl:944
+#: scripts/dpkg-source.pl:594 scripts/dpkg-source.pl:953
 #, perl-format
 msgid "unable to remove `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:594
+#: scripts/dpkg-source.pl:603
 msgid "write building diff message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:599
+#: scripts/dpkg-source.pl:608
 msgid "fork for find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:601
+#: scripts/dpkg-source.pl:610
 #, perl-format
 msgid "chdir to %s for find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:602
+#: scripts/dpkg-source.pl:611
 msgid "exec find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:611
+#: scripts/dpkg-source.pl:620
 #, perl-format
 msgid "cannot stat file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:618
+#: scripts/dpkg-source.pl:627
 #, perl-format
 msgid "cannot read link %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:620
+#: scripts/dpkg-source.pl:629
 #, perl-format
 msgid "cannot read orig link %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:621 scripts/dpkg-source.pl:622
+#: scripts/dpkg-source.pl:630 scripts/dpkg-source.pl:631
 #, perl-format
 msgid "symlink to %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:629 scripts/dpkg-source.pl:700
+#: scripts/dpkg-source.pl:638 scripts/dpkg-source.pl:709
 #, perl-format
 msgid "cannot stat orig file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:632
+#: scripts/dpkg-source.pl:641
 #, perl-format
 msgid "newly created empty file '%s' will not be represented in diff"
 msgstr ""
 
-#: scripts/dpkg-source.pl:636
+#: scripts/dpkg-source.pl:645
 #, perl-format
 msgid "executable mode %04o of '%s' will not be represented in diff"
 msgstr ""
 
-#: scripts/dpkg-source.pl:641
+#: scripts/dpkg-source.pl:650
 #, perl-format
 msgid "special mode %04o of '%s' will not be represented in diff"
 msgstr ""
 
-#: scripts/dpkg-source.pl:648 scripts/dpkg-source.pl:1523
+#: scripts/dpkg-source.pl:657 scripts/dpkg-source.pl:1532
 msgid "something else"
 msgstr ""
 
-#: scripts/dpkg-source.pl:649
+#: scripts/dpkg-source.pl:658
 msgid "plain file"
 msgstr ""
 
-#: scripts/dpkg-source.pl:652
+#: scripts/dpkg-source.pl:661
 msgid "fork for diff"
 msgstr ""
 
-#: scripts/dpkg-source.pl:661
+#: scripts/dpkg-source.pl:670
 msgid "exec diff"
 msgstr ""
 
-#: scripts/dpkg-source.pl:668
+#: scripts/dpkg-source.pl:677
 msgid "binary file contents changed"
 msgstr ""
 
-#: scripts/dpkg-source.pl:673
+#: scripts/dpkg-source.pl:682
 #, perl-format
 msgid "file %s has no final newline (either original or modified version)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:677
+#: scripts/dpkg-source.pl:686
 #, perl-format
 msgid "unknown line from diff -u on %s: `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:680
+#: scripts/dpkg-source.pl:689
 msgid "failed to write to compression pipe"
 msgstr ""
 
-#: scripts/dpkg-source.pl:686
+#: scripts/dpkg-source.pl:695
 msgid "diff gave 1 but no diff lines found"
 msgstr ""
 
-#: scripts/dpkg-source.pl:689
+#: scripts/dpkg-source.pl:698
 #, perl-format
 msgid "diff on %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:695
+#: scripts/dpkg-source.pl:704
 msgid "device or socket is not allowed"
 msgstr ""
 
-#: scripts/dpkg-source.pl:702
+#: scripts/dpkg-source.pl:711
 msgid "not a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:703
+#: scripts/dpkg-source.pl:712
 msgid "directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:706
+#: scripts/dpkg-source.pl:715
 #, perl-format
 msgid "unknown file type (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:710
+#: scripts/dpkg-source.pl:719
 msgid "finish write to compression pipe"
 msgstr ""
 
-#: scripts/dpkg-source.pl:718
+#: scripts/dpkg-source.pl:727
 msgid "fork for 2nd find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:720
+#: scripts/dpkg-source.pl:729
 #, perl-format
 msgid "chdir to %s for 2nd find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:721
+#: scripts/dpkg-source.pl:730
 msgid "exec 2nd find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:730
+#: scripts/dpkg-source.pl:739
 #, perl-format
 msgid "cannot check orig file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:732
+#: scripts/dpkg-source.pl:741
 #, perl-format
 msgid "ignoring deletion of file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:734
+#: scripts/dpkg-source.pl:743
 #, perl-format
 msgid "ignoring deletion of directory %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:736
+#: scripts/dpkg-source.pl:745
 #, perl-format
 msgid "ignoring deletion of symlink %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:738
+#: scripts/dpkg-source.pl:747
 msgid "not a file, directory or link"
 msgstr ""
 
-#: scripts/dpkg-source.pl:739 scripts/dpkg-source.pl:1518
+#: scripts/dpkg-source.pl:748 scripts/dpkg-source.pl:1527
 msgid "nonexistent"
 msgstr ""
 
-#: scripts/dpkg-source.pl:754
+#: scripts/dpkg-source.pl:763
 msgid "write building message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:756
+#: scripts/dpkg-source.pl:765
 #, perl-format
 msgid "create %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:762
+#: scripts/dpkg-source.pl:771
 #, perl-format
 msgid "%s: unrepresentable changes to source"
 msgstr "%s: hi ha canvis no representables al font"
 
-#: scripts/dpkg-source.pl:763
+#: scripts/dpkg-source.pl:772
 #, perl-format
 msgid "write error msg: %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:772
+#: scripts/dpkg-source.pl:781
 #, perl-format
 msgid "source handling style -s%s not allowed with -x"
 msgstr ""
 
-#: scripts/dpkg-source.pl:775
+#: scripts/dpkg-source.pl:784
 msgid "-x needs at least one argument, the .dsc"
 msgstr ""
 
-#: scripts/dpkg-source.pl:776
+#: scripts/dpkg-source.pl:785
 msgid "-x takes no more than two arguments"
 msgstr ""
 
-#: scripts/dpkg-source.pl:780
+#: scripts/dpkg-source.pl:789
 msgid "-x needs the .dsc file as first argument, not a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:788
+#: scripts/dpkg-source.pl:797
 #, perl-format
 msgid "unpack target exists: %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:792 scripts/dpkg-source.pl:823
+#: scripts/dpkg-source.pl:801 scripts/dpkg-source.pl:832
 #, perl-format
 msgid "cannot open .dsc file %s: %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:812
+#: scripts/dpkg-source.pl:821
 #, perl-format
 msgid "failed to verify signature on %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:816
+#: scripts/dpkg-source.pl:825
 #, perl-format
 msgid "could not verify signature on %s since gpg isn't installed"
 msgstr ""
 "no s'ha pogut verificar la signatura de %s perquè gpg no està instal·lat"
 
-#: scripts/dpkg-source.pl:820
+#: scripts/dpkg-source.pl:829
 #, perl-format
 msgid "extracting unsigned source package (%s)"
 msgstr "s'està extraient el paquet font sense signar (%s)"
 
-#: scripts/dpkg-source.pl:829
+#: scripts/dpkg-source.pl:838
 #, perl-format
 msgid "missing critical source control field %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:835
+#: scripts/dpkg-source.pl:844
 #, perl-format
 msgid "Unsupported format of .dsc file (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:867
+#: scripts/dpkg-source.pl:876
 #, perl-format
 msgid "Files field contains invalid filename `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:872
+#: scripts/dpkg-source.pl:881
 #, perl-format
 msgid "repeated file type - files `%s' and `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:886
+#: scripts/dpkg-source.pl:895
 #, perl-format
 msgid "unrecognised file type - `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:890
+#: scripts/dpkg-source.pl:899
 msgid "no tarfile in Files field"
 msgstr ""
 
-#: scripts/dpkg-source.pl:893
+#: scripts/dpkg-source.pl:902
 msgid "multiple tarfiles in native package"
 msgstr ""
 
-#: scripts/dpkg-source.pl:894
+#: scripts/dpkg-source.pl:903
 msgid "native package with .orig.tar"
 msgstr ""
 
-#: scripts/dpkg-source.pl:897
+#: scripts/dpkg-source.pl:906
 msgid "no upstream tarfile in Files field"
 msgstr ""
 
-#: scripts/dpkg-source.pl:900
+#: scripts/dpkg-source.pl:909
 #, perl-format
 msgid "multiple upstream tarballs in %s format dsc"
 msgstr ""
 
-#: scripts/dpkg-source.pl:902
+#: scripts/dpkg-source.pl:911
 #, perl-format
 msgid "debian.tar in %s format dsc"
 msgstr ""
 
-#: scripts/dpkg-source.pl:912
+#: scripts/dpkg-source.pl:921
 #, perl-format
 msgid "%s: extracting %s in %s"
 msgstr "%s: s'està extraient %s a %s"
 
-#: scripts/dpkg-source.pl:914
+#: scripts/dpkg-source.pl:923
 msgid "write extracting message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:939
+#: scripts/dpkg-source.pl:948
 #, perl-format
 msgid "%s: unpacking %s"
 msgstr "%s: s'està desempaquetant %s"
 
-#: scripts/dpkg-source.pl:952
+#: scripts/dpkg-source.pl:961
 #, perl-format
 msgid "failed to stat `%s' to see if need to copy"
 msgstr ""
 
-#: scripts/dpkg-source.pl:964
+#: scripts/dpkg-source.pl:973
 #, perl-format
 msgid "failed to check destination `%s' to see if need to copy"
 msgstr ""
 
-#: scripts/dpkg-source.pl:977
+#: scripts/dpkg-source.pl:986
 msgid "unable to keep orig directory (already exists)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1011 scripts/dpkg-source.pl:1071
+#: scripts/dpkg-source.pl:1020 scripts/dpkg-source.pl:1080
 #, perl-format
 msgid "cannot stat %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1013
+#: scripts/dpkg-source.pl:1022
 #, perl-format
 msgid "failed to create %s subdirectory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1016
+#: scripts/dpkg-source.pl:1025
 #, perl-format
 msgid "diff patches file in directory `%s', but %s isn't a directory !"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1026
+#: scripts/dpkg-source.pl:1035
 #, perl-format
 msgid "failed to rename newly-extracted %s to %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1032
+#: scripts/dpkg-source.pl:1041
 #, perl-format
 msgid "failed to rename saved %s to %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1037
+#: scripts/dpkg-source.pl:1046
 #, perl-format
 msgid "%s: applying %s"
 msgstr "%s: s'està aplicant %s"
 
-#: scripts/dpkg-source.pl:1042 scripts/dpkg-source.pl:1353
+#: scripts/dpkg-source.pl:1051 scripts/dpkg-source.pl:1362
 #, perl-format
 msgid "can't open diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1045
+#: scripts/dpkg-source.pl:1054
 msgid "fork for patch"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1047
+#: scripts/dpkg-source.pl:1056
 msgid "reopen gzip for patch"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1048
+#: scripts/dpkg-source.pl:1057
 #, perl-format
 msgid "chdir to %s for patch"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1052
+#: scripts/dpkg-source.pl:1061
 msgid "exec patch"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1055
+#: scripts/dpkg-source.pl:1064
 msgid "wait for patch"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1065
+#: scripts/dpkg-source.pl:1074
 #, perl-format
 msgid "cannot change timestamp for %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1067
+#: scripts/dpkg-source.pl:1076
 #, perl-format
 msgid "remove patch backup file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1072
+#: scripts/dpkg-source.pl:1081
 #, perl-format
 msgid "%s does not exist"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1075
+#: scripts/dpkg-source.pl:1084
 #, perl-format
 msgid "cannot make %s executable"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1077
+#: scripts/dpkg-source.pl:1086
 #, perl-format
 msgid "%s is not a plain file"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1081
+#: scripts/dpkg-source.pl:1090
 msgid "cannot stat `.'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1089
+#: scripts/dpkg-source.pl:1098
 #, perl-format
 msgid "cannot stat extracted object `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1100
+#: scripts/dpkg-source.pl:1109
 #, perl-format
 msgid "unknown object `%s' after extract (mode 0%o)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1105
+#: scripts/dpkg-source.pl:1114
 #, perl-format
 msgid "cannot change mode of `%s' to 0%o from 0%o"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1116
+#: scripts/dpkg-source.pl:1125
 #, perl-format
 msgid "cannot read %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1117
+#: scripts/dpkg-source.pl:1126
 #, perl-format
 msgid "cannot fstat %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1118
+#: scripts/dpkg-source.pl:1127
 #, perl-format
 msgid "file %s has size %s instead of expected %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1122
+#: scripts/dpkg-source.pl:1131
 #, perl-format
 msgid "file %s has md5sum %s instead of expected %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1124
+#: scripts/dpkg-source.pl:1133
 msgid "reopen stdin from /dev/null"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1131
+#: scripts/dpkg-source.pl:1140
 #, perl-format
 msgid "cannot stat directory %s (before removal)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1137
+#: scripts/dpkg-source.pl:1146
 #, perl-format
 msgid "unable to check for removal of dir `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1139
+#: scripts/dpkg-source.pl:1148
 #, perl-format
 msgid "rm -rf failed to remove `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1151
+#: scripts/dpkg-source.pl:1160
 msgid "fork for cpio"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1155
+#: scripts/dpkg-source.pl:1164
 msgid "reopen gzip for cpio"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1157
+#: scripts/dpkg-source.pl:1166
 msgid "exec cpio"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1171
+#: scripts/dpkg-source.pl:1180
 #, perl-format
 msgid "tarfile `%s' contains object with newline in its name (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1179
+#: scripts/dpkg-source.pl:1188
 #, perl-format
 msgid ""
 "first output from cpio -0t (from `%s') contains newline - you probably have "
 "an out of date version of cpio.  GNU cpio 2.4.2-2 is known to work"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1188
+#: scripts/dpkg-source.pl:1197
 #, perl-format
 msgid ""
 "tarfile `%s' does not extract into a directory off the current directory (%s "
 "from %s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1197
+#: scripts/dpkg-source.pl:1206
 #, perl-format
 msgid "tarfile `%s' contains object (%s) not in expected directory (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1203 scripts/dpkg-source.pl:1303
+#: scripts/dpkg-source.pl:1212 scripts/dpkg-source.pl:1312
 #, perl-format
 msgid "tarfile `%s' contains object with /../ in its name (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1230
+#: scripts/dpkg-source.pl:1239
 msgid "fork for tar -t"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1234
+#: scripts/dpkg-source.pl:1243
 msgid "reopen gzip for tar -t"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1235
+#: scripts/dpkg-source.pl:1244
 msgid "exec tar -vvtf -"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1245
+#: scripts/dpkg-source.pl:1254
 #, perl-format
 msgid "tarfile `%s' contains unknown object listed by tar as `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1252
+#: scripts/dpkg-source.pl:1261
 #, perl-format
 msgid "tarfile `%s' contains object `%s' with unknown or forbidden type `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1262
+#: scripts/dpkg-source.pl:1271
 #, perl-format
 msgid "tarfile `%s' contains incomplete entry `%s'\n"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1286
+#: scripts/dpkg-source.pl:1295
 #, perl-format
 msgid "filename '%s' was truncated by cpio; unable to check full pathname"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1293
+#: scripts/dpkg-source.pl:1302
 #, perl-format
 msgid ""
 "tarfile `%s' contains unexpected object listed by tar as `%s'; expected `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1308
+#: scripts/dpkg-source.pl:1317
 #, perl-format
 msgid "tarfile `%s' contains file with name ending in .dpkg-orig"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1313
+#: scripts/dpkg-source.pl:1322
 #, perl-format
 msgid "tarfile `%s' contains setuid, setgid or sticky object `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1318
+#: scripts/dpkg-source.pl:1327
 #, perl-format
 msgid "tarfile `%s' contains object `debian' that isn't a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1327
+#: scripts/dpkg-source.pl:1336
 #, perl-format
 msgid ""
 "tarfile `%s' contains object `%s' but its containing directory `%s' does not "
 "precede it"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1365 scripts/dpkg-source.pl:1410
-#: scripts/dpkg-source.pl:1421
+#: scripts/dpkg-source.pl:1374 scripts/dpkg-source.pl:1419
+#: scripts/dpkg-source.pl:1430
 #, perl-format
 msgid "diff `%s' is missing trailing newline"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1367
+#: scripts/dpkg-source.pl:1376
 #, perl-format
 msgid "expected ^--- in line %d of diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1370
+#: scripts/dpkg-source.pl:1379
 #, perl-format
 msgid "diff `%s' patches file with no subdirectory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1372
+#: scripts/dpkg-source.pl:1381
 #, perl-format
 msgid "diff `%s' patches file with name ending .dpkg-orig"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1377
+#: scripts/dpkg-source.pl:1386
 #, perl-format
 msgid "diff `%s' finishes in middle of ---/+++ (line %d)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1382 scripts/dpkg-source.pl:1389
+#: scripts/dpkg-source.pl:1391 scripts/dpkg-source.pl:1398
 #, perl-format
 msgid "line after --- isn't as expected in diff `%s' (line %d)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1398
+#: scripts/dpkg-source.pl:1407
 #, perl-format
 msgid "diff `%s' patches something which is not a plain file"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1403
+#: scripts/dpkg-source.pl:1412
 #, perl-format
 msgid "diff patches file %s twice"
 msgstr "diff aplica pedaços al fitxer %s dues vegades"
 
-#: scripts/dpkg-source.pl:1413
+#: scripts/dpkg-source.pl:1422
 #, perl-format
 msgid "Expected ^@@ in line %d of diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1419
+#: scripts/dpkg-source.pl:1428
 #, perl-format
 msgid "unexpected end of diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1427
+#: scripts/dpkg-source.pl:1436
 #, perl-format
 msgid "expected [ +-] at start of line %d of diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1432
+#: scripts/dpkg-source.pl:1441
 #, perl-format
 msgid "expected ^@@ at line %d of diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1443
+#: scripts/dpkg-source.pl:1452
 msgid "fork for tar -xkf -"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1445
+#: scripts/dpkg-source.pl:1454
 msgid "reopen gzip for tar -xkf -"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1448
+#: scripts/dpkg-source.pl:1457
 #, perl-format
 msgid "cannot chdir to `%s' for tar extract"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1450
+#: scripts/dpkg-source.pl:1459
 msgid "exec tar -xkf -"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1453
+#: scripts/dpkg-source.pl:1462
 msgid "wait for tar -xkf -"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1485
+#: scripts/dpkg-source.pl:1494
 #, perl-format
 msgid "Unable to open dir %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1487
+#: scripts/dpkg-source.pl:1496
 #, perl-format
 msgid "Unable to close dir %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1490 scripts/dpkg-source.pl:1498
-#: scripts/dpkg-source.pl:1503
+#: scripts/dpkg-source.pl:1499 scripts/dpkg-source.pl:1507
+#: scripts/dpkg-source.pl:1512
 #, perl-format
 msgid "Unable to rename %s to %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1495
+#: scripts/dpkg-source.pl:1504
 #, perl-format
 msgid "Unable to mkdir %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1511
+#: scripts/dpkg-source.pl:1520
 msgid "reopen stderr for tar to grep out blocks message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1521
+#: scripts/dpkg-source.pl:1530
 #, perl-format
 msgid "checktype %s (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1529
+#: scripts/dpkg-source.pl:1538
 msgid "only one of -x or -b allowed, and only once"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1534
+#: scripts/dpkg-source.pl:1543
 #, perl-format
 msgid "%s: cannot represent change to %s: %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1536 scripts/dpkg-source.pl:1545
+#: scripts/dpkg-source.pl:1545 scripts/dpkg-source.pl:1554
 msgid "write syserr unrep"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1541
+#: scripts/dpkg-source.pl:1550
 #, perl-format
 msgid ""
 "%s: cannot represent change to %s:\n"
@@ -2346,80 +2346,80 @@ msgid ""
 "%s:  old version is %s\n"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1563 scripts/dpkg-source.pl:1594
+#: scripts/dpkg-source.pl:1572 scripts/dpkg-source.pl:1603
 #, fuzzy, perl-format
 msgid "unknown compression type on file %s"
 msgstr "la variable de substitució ${%s} és desconeguda"
 
-#: scripts/dpkg-source.pl:1570
+#: scripts/dpkg-source.pl:1579
 #, perl-format
 msgid "create file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1571
+#: scripts/dpkg-source.pl:1580
 msgid "pipe for gzip"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1572
+#: scripts/dpkg-source.pl:1581
 msgid "fork for gzip"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1574
+#: scripts/dpkg-source.pl:1583
 msgid "reopen gzip pipe"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1576
+#: scripts/dpkg-source.pl:1585
 msgid "reopen tar"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1577
+#: scripts/dpkg-source.pl:1586
 msgid "exec gzip"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1597
+#: scripts/dpkg-source.pl:1606
 #, perl-format
 msgid "read file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1598
+#: scripts/dpkg-source.pl:1607
 #, perl-format
 msgid "pipe for %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1599
+#: scripts/dpkg-source.pl:1608
 #, perl-format
 msgid "fork for %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1601
+#: scripts/dpkg-source.pl:1610
 #, perl-format
 msgid "reopen %s pipe"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1603
+#: scripts/dpkg-source.pl:1612
 msgid "reopen input file"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1604
+#: scripts/dpkg-source.pl:1613
 #, perl-format
 msgid "exec %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1611
+#: scripts/dpkg-source.pl:1620
 msgid "wait for gzip"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1621
+#: scripts/dpkg-source.pl:1630
 #, perl-format
 msgid "tried to add file `%s' twice"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1622
+#: scripts/dpkg-source.pl:1631
 #, perl-format
 msgid "could not stat output file `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1643
+#: scripts/dpkg-source.pl:1652
 #, perl-format
 msgid "bogus character `\\%s' in `%s'"
 msgstr ""
@@ -2569,27 +2569,27 @@ msgstr ""
 msgid "Couldn't parse dynamic symbol definition: %s"
 msgstr ""
 
-#: scripts/Dpkg/Shlibs/SymbolFile.pm:101
+#: scripts/Dpkg/Shlibs/SymbolFile.pm:103
 #, perl-format
 msgid "Can't open %s: %s"
 msgstr ""
 
-#: scripts/Dpkg/Shlibs/SymbolFile.pm:107
+#: scripts/Dpkg/Shlibs/SymbolFile.pm:109
 #, perl-format
 msgid "Symbol information must be preceded by a header (file %s, line %s)."
 msgstr ""
 
-#: scripts/Dpkg/Shlibs/SymbolFile.pm:147
+#: scripts/Dpkg/Shlibs/SymbolFile.pm:149
 #, perl-format
 msgid "Failed to parse a line in %s: %s"
 msgstr ""
 
-#: scripts/Dpkg/Shlibs/SymbolFile.pm:161
+#: scripts/Dpkg/Shlibs/SymbolFile.pm:163
 #, perl-format
 msgid "Can't open %s for writing: %s"
 msgstr ""
 
-#: scripts/Dpkg/Shlibs/SymbolFile.pm:194
+#: scripts/Dpkg/Shlibs/SymbolFile.pm:196
 msgid "Can't merge symbols from objects without SONAME."
 msgstr ""
 
diff --git a/scripts/po/de.po b/scripts/po/de.po
index a2e0b421..f6f84165 100644
--- a/scripts/po/de.po
+++ b/scripts/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg scripts\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\n"
 "PO-Revision-Date: 2007-12-21 17:23+0100\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german@lists.debian.org>\n"
@@ -114,8 +114,8 @@ msgstr "kann substvars-Datei %s nicht 
 msgid "fork for parse changelog"
 msgstr "forke zum auswerten des changelogs"
 
-#: scripts/controllib.pl:191 scripts/dpkg-genchanges.pl:305
-#: scripts/dpkg-gencontrol.pl:220 scripts/dpkg-source.pl:380
+#: scripts/controllib.pl:191 scripts/dpkg-genchanges.pl:306
+#: scripts/dpkg-gencontrol.pl:220 scripts/dpkg-source.pl:381
 msgid "parsed version of changelog"
 msgstr "ausgewertete Version des changelogs"
 
@@ -187,11 +187,11 @@ msgid "syntax error in %s at line %d: %s"
 msgstr "Syntaxfehler in %s auf Zeile %d: %s"
 
 #: scripts/dpkg-architecture.pl:35 scripts/dpkg-buildpackage.pl:21
-#: scripts/dpkg-distaddfile.pl:21 scripts/dpkg-genchanges.pl:82
+#: scripts/dpkg-distaddfile.pl:21 scripts/dpkg-genchanges.pl:83
 #: scripts/dpkg-gencontrol.pl:50 scripts/dpkg-gensymbols.pl:36
 #: scripts/dpkg-parsechangelog.pl:24 scripts/dpkg-scanpackages.pl:51
-#: scripts/dpkg-scansources.pl:96 scripts/dpkg-shlibdeps.pl:357
-#: scripts/dpkg-source.pl:138 scripts/changelog/debian.pl:31
+#: scripts/dpkg-scansources.pl:96 scripts/dpkg-shlibdeps.pl:359
+#: scripts/dpkg-source.pl:139 scripts/changelog/debian.pl:31
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s Version %s.\n"
@@ -207,10 +207,10 @@ msgstr ""
 "Copyright (C) 2004-2005 Scott James Remnant <scott@netsplit.com>."
 
 #: scripts/dpkg-architecture.pl:41 scripts/dpkg-buildpackage.pl:28
-#: scripts/dpkg-distaddfile.pl:26 scripts/dpkg-genchanges.pl:88
+#: scripts/dpkg-distaddfile.pl:26 scripts/dpkg-genchanges.pl:89
 #: scripts/dpkg-gencontrol.pl:56 scripts/dpkg-gensymbols.pl:42
-#: scripts/dpkg-parsechangelog.pl:30 scripts/dpkg-shlibdeps.pl:366
-#: scripts/dpkg-source.pl:143 scripts/changelog/debian.pl:35
+#: scripts/dpkg-parsechangelog.pl:30 scripts/dpkg-shlibdeps.pl:368
+#: scripts/dpkg-source.pl:144 scripts/changelog/debian.pl:35
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -264,9 +264,9 @@ msgstr ""
 "  --version          zeigt die Version.\n"
 
 #: scripts/dpkg-architecture.pl:120 scripts/dpkg-distaddfile.pl:54
-#: scripts/dpkg-genchanges.pl:177 scripts/dpkg-gencontrol.pl:129
+#: scripts/dpkg-genchanges.pl:178 scripts/dpkg-gencontrol.pl:129
 #: scripts/dpkg-gensymbols.pl:108 scripts/dpkg-shlibdeps.pl:82
-#: scripts/dpkg-source.pl:268 scripts/changelog/debian.pl:64
+#: scripts/dpkg-source.pl:269 scripts/changelog/debian.pl:64
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "unbekannte Option »%s«"
@@ -386,7 +386,8 @@ msgstr ""
 "  -us            unsignierte Quellen.\n"
 "  -uc            unsignierte changes.\n"
 "  -a<Arch>       Debian-Architektur, für die gebaut wird (impliziert -d).\n"
-"  -b             nur binär, Quellen nicht bauen.      } auch weitergegeben an\n"
+"  -b             nur binär, Quellen nicht bauen.      } auch weitergegeben "
+"an\n"
 "  -B             nur binär, keine arch-indep-Dateien. } dpkg-genchanges\n"
 "  -A             nur binär, nur arch-indep-Dateien.   }\n"
 "  -S             nur Quellen, keine Binärdateien.     }\n"
@@ -563,7 +564,7 @@ msgid "%s: Build conflicts: "
 msgstr "%s: Baukonflikte: "
 
 #: scripts/dpkg-checkbuilddeps.pl:157 scripts/dpkg-gencontrol.pl:261
-#: scripts/dpkg-gencontrol.pl:268 scripts/dpkg-source.pl:319
+#: scripts/dpkg-gencontrol.pl:268 scripts/dpkg-source.pl:320
 #, perl-format
 msgid "error occurred while parsing %s"
 msgstr "Fehler beim Parsen von %s"
@@ -625,7 +626,7 @@ msgstr "schreibe neuen Eintrag in neue Dateienliste-Datei"
 msgid "close new files list file"
 msgstr "schließe neue Dateienliste-Datei"
 
-#: scripts/dpkg-genchanges.pl:84
+#: scripts/dpkg-genchanges.pl:85
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson.\n"
@@ -635,7 +636,7 @@ msgstr ""
 "Copyright (C) 1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 
-#: scripts/dpkg-genchanges.pl:96
+#: scripts/dpkg-genchanges.pl:97
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...]\n"
@@ -672,7 +673,8 @@ msgstr ""
 "  -b                       rein binärer Bau - keine Quelldateien.\n"
 "  -B                       Architektur-spezifisch - keine Quellen oder\n"
 "                           Architektur-unabhängigen Dateien.\n"
-"  -A                       nur Architektur-unabhängiges - keine Quellen oder\n"
+"  -A                       nur Architektur-unabhängiges - keine Quellen "
+"oder\n"
 "                           Architektur-spezifischen Dateien\n"
 "  -S                       nur-Quellen-Upload.\n"
 "  -c<Steuerdatei>          erhalte Steuerinformationen aus dieser Datei.\n"
@@ -701,170 +703,170 @@ msgstr ""
 "  -h, --help               zeige diese Hilfsmeldung.\n"
 "      --version            zeige die Version.\n"
 
-#: scripts/dpkg-genchanges.pl:129 scripts/dpkg-genchanges.pl:132
-#: scripts/dpkg-genchanges.pl:136 scripts/dpkg-genchanges.pl:140
+#: scripts/dpkg-genchanges.pl:130 scripts/dpkg-genchanges.pl:133
+#: scripts/dpkg-genchanges.pl:137 scripts/dpkg-genchanges.pl:141
 #, perl-format
 msgid "cannot combine %s and -S"
 msgstr "kann %s und -S nicht kombinieren"
 
-#: scripts/dpkg-genchanges.pl:134
+#: scripts/dpkg-genchanges.pl:135
 #, perl-format
 msgid "%s: arch-specific upload - not including arch-independent packages"
 msgstr ""
 "%s: architektur-spezifischer Upload - schließe architektur-unabhängige "
 "Pakete nicht ein"
 
-#: scripts/dpkg-genchanges.pl:138
+#: scripts/dpkg-genchanges.pl:139
 #, perl-format
 msgid "%s: arch-indep upload - not including arch-specific packages"
 msgstr ""
 "%s: architektur-unabhängiger Upload - schließe architektur-spezifische "
 "Pakete nicht ein"
 
-#: scripts/dpkg-genchanges.pl:185
+#: scripts/dpkg-genchanges.pl:186
 msgid "cannot read files list file"
 msgstr "kann Dateienliste-Datei nicht lesen"
 
-#: scripts/dpkg-genchanges.pl:189
+#: scripts/dpkg-genchanges.pl:190
 #, perl-format
 msgid "duplicate files list entry for package %s (line %d)"
 msgstr "doppelter Dateienliste-Eintrag für Paket %s (Zeile %d)"
 
-#: scripts/dpkg-genchanges.pl:197 scripts/dpkg-genchanges.pl:211
+#: scripts/dpkg-genchanges.pl:198 scripts/dpkg-genchanges.pl:212
 #, perl-format
 msgid "duplicate files list entry for file %s (line %d)"
 msgstr "doppelter Dateienliste-Eintrag für Datei %s (Zeile %d)"
 
-#: scripts/dpkg-genchanges.pl:217
+#: scripts/dpkg-genchanges.pl:218
 #, perl-format
 msgid "badly formed line in files list file, line %d"
 msgstr "ungültige Zeile in Dateienliste-Datei, Zeile %d"
 
-#: scripts/dpkg-genchanges.pl:238 scripts/dpkg-gencontrol.pl:174
-#: scripts/dpkg-source.pl:327
+#: scripts/dpkg-genchanges.pl:239 scripts/dpkg-gencontrol.pl:174
+#: scripts/dpkg-source.pl:328
 msgid "general section of control info file"
 msgstr "allgemeiner Abschnitt der Steuer-Infodatei"
 
-#: scripts/dpkg-genchanges.pl:249
+#: scripts/dpkg-genchanges.pl:250
 #, perl-format
 msgid "package %s in control file but not in files list"
 msgstr "Paket %s in Steuerdatei aber nicht in Dateiliste"
 
-#: scripts/dpkg-genchanges.pl:292 scripts/dpkg-gencontrol.pl:205
-#: scripts/dpkg-source.pl:367
+#: scripts/dpkg-genchanges.pl:293 scripts/dpkg-gencontrol.pl:205
+#: scripts/dpkg-source.pl:368
 msgid "package's section of control info file"
 msgstr "Paketabschnitt der Steuer-Infodatei"
 
-#: scripts/dpkg-genchanges.pl:316
+#: scripts/dpkg-genchanges.pl:317
 msgid "read changesdescription"
 msgstr "lese Änderungsbeschreibung"
 
-#: scripts/dpkg-genchanges.pl:327
+#: scripts/dpkg-genchanges.pl:328
 #, perl-format
 msgid "package %s listed in files list but not in control info"
 msgstr "Paket %s in Dateienliste aber nicht in der Steuer-Info aufgeführt"
 
-#: scripts/dpkg-genchanges.pl:339
+#: scripts/dpkg-genchanges.pl:340
 #, perl-format
 msgid "missing Section for binary package %s; using '-'"
 msgstr "fehlender Bereich für Binärpaket %s; verwende »-«"
 
-#: scripts/dpkg-genchanges.pl:341
+#: scripts/dpkg-genchanges.pl:342
 #, perl-format
 msgid "package %s has section %s in control file but %s in files list"
 msgstr "Paket %s hat Bereich %s in der Steuerdatei, aber %s in der Dateiliste"
 
-#: scripts/dpkg-genchanges.pl:348
+#: scripts/dpkg-genchanges.pl:349
 #, perl-format
 msgid "missing Priority for binary package %s; using '-'"
 msgstr "fehlende Priorität für Binärpaket %s; verwende »-«"
 
-#: scripts/dpkg-genchanges.pl:350
+#: scripts/dpkg-genchanges.pl:351
 #, perl-format
 msgid "package %s has priority %s in control file but %s in files list"
 msgstr "Paket %s hat Priorität %s in Steuerdatei, aber %s in Dateienliste"
 
-#: scripts/dpkg-genchanges.pl:365
+#: scripts/dpkg-genchanges.pl:366
 msgid "missing Section for source files"
 msgstr "fehlender Bereich für Quelldateien"
 
-#: scripts/dpkg-genchanges.pl:370
+#: scripts/dpkg-genchanges.pl:371
 msgid "missing Priority for source files"
 msgstr "fehlende Priorität für Quelldateien"
 
-#: scripts/dpkg-genchanges.pl:375
+#: scripts/dpkg-genchanges.pl:376
 #, perl-format
 msgid "cannot open .dsc file %s"
 msgstr "kann .dsc-Datei %s nicht öffnen"
 
-#: scripts/dpkg-genchanges.pl:378 scripts/dpkg-source.pl:824
+#: scripts/dpkg-genchanges.pl:379 scripts/dpkg-source.pl:833
 #, perl-format
 msgid "source control file %s"
 msgstr "Quell-Steuerdatei %s"
 
-#: scripts/dpkg-genchanges.pl:384 scripts/dpkg-source.pl:863
+#: scripts/dpkg-genchanges.pl:385 scripts/dpkg-source.pl:872
 #, perl-format
 msgid "Files field contains bad line `%s'"
 msgstr "Files-Feld enthält ungültige Zeile »%s«"
 
-#: scripts/dpkg-genchanges.pl:396
+#: scripts/dpkg-genchanges.pl:397
 msgid "not including original source code in upload"
 msgstr "füge Originalquellen beim Hochladen nicht hinzu"
 
-#: scripts/dpkg-genchanges.pl:401
+#: scripts/dpkg-genchanges.pl:402
 msgid "ignoring -sd option for native Debian package"
 msgstr "ignoriere Option »-sd« bei »Debian native«-Paketen"
 
-#: scripts/dpkg-genchanges.pl:403
+#: scripts/dpkg-genchanges.pl:404
 msgid "including full source code in upload"
 msgstr "füge kompletten Quellcode beim Hochladen hinzu"
 
-#: scripts/dpkg-genchanges.pl:406
+#: scripts/dpkg-genchanges.pl:407
 msgid "binary-only upload - not including any source code"
 msgstr "rein-binärer Upload - füge keinen Quellcode hinzu"
 
-#: scripts/dpkg-genchanges.pl:410
+#: scripts/dpkg-genchanges.pl:411
 msgid "write original source message"
 msgstr "schreibe ursprüngliche Quell-Nachricht"
 
-#: scripts/dpkg-genchanges.pl:440
+#: scripts/dpkg-genchanges.pl:441
 #, perl-format
 msgid "cannot open upload file %s for reading"
 msgstr "kann hochzuladene Datei %s nicht zum Lesen öffnen"
 
-#: scripts/dpkg-genchanges.pl:441
+#: scripts/dpkg-genchanges.pl:442
 #, perl-format
 msgid "cannot fstat upload file %s"
 msgstr "kann keinen »fstat« auf hochzuladene Datei %s durchführen"
 
-#: scripts/dpkg-genchanges.pl:443
+#: scripts/dpkg-genchanges.pl:444
 #, perl-format
 msgid "upload file %s is empty"
 msgstr "hochzuladene Datei %s ist leer"
 
-#: scripts/dpkg-genchanges.pl:445
+#: scripts/dpkg-genchanges.pl:446
 #, perl-format
 msgid "md5sum upload file %s"
 msgstr "md5sum der hochzuladenen Datei %s"
 
-#: scripts/dpkg-genchanges.pl:447
+#: scripts/dpkg-genchanges.pl:448
 #, perl-format
 msgid "md5sum upload file %s gave strange output `%s'"
 msgstr ""
 "Die Ausgabe von md5sum für die hochzuladene Datei %s war merkwürdig: »%s«"
 
-#: scripts/dpkg-genchanges.pl:451
+#: scripts/dpkg-genchanges.pl:452
 #, perl-format
 msgid "md5sum of source file %s (%s) is different from md5sum in %s (%s)"
 msgstr "md5sum der Quelldatei %s (%s) unterscheidet sich von md5sum in %s (%s)"
 
-#: scripts/dpkg-genchanges.pl:466 scripts/dpkg-source.pl:396
+#: scripts/dpkg-genchanges.pl:467 scripts/dpkg-source.pl:397
 #, perl-format
 msgid "missing information for critical output field %s"
 msgstr "fehlende Informationen für kritisches Ausgabefeld %s"
 
-#: scripts/dpkg-genchanges.pl:471 scripts/dpkg-gencontrol.pl:278
-#: scripts/dpkg-gencontrol.pl:281 scripts/dpkg-source.pl:400
+#: scripts/dpkg-genchanges.pl:472 scripts/dpkg-gencontrol.pl:278
+#: scripts/dpkg-gencontrol.pl:281 scripts/dpkg-source.pl:401
 #, perl-format
 msgid "missing information for output field %s"
 msgstr "fehlende Informationen für Ausgabefeld %s"
@@ -955,7 +957,7 @@ msgstr ""
 "aktuelle Host-Architektur »%s« erscheint nicht in der Architekturliste (%s) "
 "des Pakets"
 
-#: scripts/dpkg-gencontrol.pl:224 scripts/dpkg-source.pl:384
+#: scripts/dpkg-gencontrol.pl:224 scripts/dpkg-source.pl:385
 #, perl-format
 msgid "value from nowhere, with key >%s< and value >%s<"
 msgstr "Wert von nirgendwo, mit Schlüssel >%s< und Wert >%s<"
@@ -1433,7 +1435,7 @@ msgstr "Abh
 msgid "need at least one executable"
 msgstr "benötige mindestens ein Programm"
 
-#: scripts/dpkg-shlibdeps.pl:115
+#: scripts/dpkg-shlibdeps.pl:116
 #, perl-format
 msgid ""
 "couldn't find library %s needed by %s (its RPATH is '%s').\n"
@@ -1448,50 +1450,50 @@ msgstr ""
 "Um dpkg-shlibdeps dabei zu helfen, private Bibliotheken zu finden, könnte es "
 "notwendig sein, LD_LIBRARY_PATH zu setzen."
 
-#: scripts/dpkg-shlibdeps.pl:198
+#: scripts/dpkg-shlibdeps.pl:200
 #, perl-format
 msgid "no dependency information found for %s (used by %s)."
 msgstr "Keine Abhängigkeitsinformationen für %s (verwendet von %s) gefunden."
 
-#: scripts/dpkg-shlibdeps.pl:238
+#: scripts/dpkg-shlibdeps.pl:240
 #, perl-format
 msgid "symbol %s used by %s found in none of the libraries."
 msgstr "Symbol %s, verwendet von %s, in keiner der Bibliotheken gefunden."
 
-#: scripts/dpkg-shlibdeps.pl:251
+#: scripts/dpkg-shlibdeps.pl:253
 #, perl-format
 msgid "%d other similar warnings have been skipped (use -v to see them all)."
 msgstr ""
 "%d andere, ähnliche Warnungen wurden übersprungen (verwenden Sie -v um alle "
 "zu sehen)."
 
-#: scripts/dpkg-shlibdeps.pl:271
+#: scripts/dpkg-shlibdeps.pl:273
 #, perl-format
 msgid "%s shouldn't be linked with %s (it uses none of its symbols)."
 msgstr ""
 "%s sollte nicht gegen %s gelinkt werden (es verwendet keine seiner Symbole)."
 
-#: scripts/dpkg-shlibdeps.pl:283
+#: scripts/dpkg-shlibdeps.pl:285
 #, perl-format
 msgid "open new substvars file `%s'"
 msgstr "öffne neue Substvars-Datei »%s«"
 
-#: scripts/dpkg-shlibdeps.pl:286
+#: scripts/dpkg-shlibdeps.pl:288
 #, perl-format
 msgid "open old varlist file `%s' for reading"
 msgstr "öffne alte Varlist-Datei »%s« zum Schreiben"
 
-#: scripts/dpkg-shlibdeps.pl:289
+#: scripts/dpkg-shlibdeps.pl:291
 #, perl-format
 msgid "copy old entry to new varlist file `%s'"
 msgstr "kopiere alte Einträge in die neue Varlist-Datei »%s«"
 
-#: scripts/dpkg-shlibdeps.pl:349
+#: scripts/dpkg-shlibdeps.pl:351
 #, perl-format
 msgid "install new varlist file `%s'"
 msgstr "installiere neue Varlist-Datei »%s«"
 
-#: scripts/dpkg-shlibdeps.pl:359
+#: scripts/dpkg-shlibdeps.pl:361
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson.\n"
@@ -1505,7 +1507,7 @@ msgstr ""
 "Copyright (C) 2006 Frank Lichtenheld.\n"
 "Copyright (C) 2007 Raphael Hertzog.\n"
 
-#: scripts/dpkg-shlibdeps.pl:374
+#: scripts/dpkg-shlibdeps.pl:376
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <executable>|-e<executable> [<option> ...]\n"
@@ -1555,28 +1557,28 @@ msgstr ""
 "Unterstützte Abhängigkeitsfelder sind:\n"
 "  %s\n"
 
-#: scripts/dpkg-shlibdeps.pl:481
+#: scripts/dpkg-shlibdeps.pl:485
 #, perl-format
 msgid "Can't extract name and version from library name `%s'"
 msgstr "Kann Name und Version aus Bibliotheksnamen »%s« nicht entnehmen"
 
-#: scripts/dpkg-shlibdeps.pl:488
+#: scripts/dpkg-shlibdeps.pl:492
 #, perl-format
 msgid "unable to open shared libs info file `%s'"
 msgstr "kann Informationsdatei für Laufzeitbibliothek »%s« nicht öffnen"
 
-#: scripts/dpkg-shlibdeps.pl:494
+#: scripts/dpkg-shlibdeps.pl:498
 #, perl-format
 msgid "shared libs info file `%s' line %d: bad line `%s'"
 msgstr ""
 "Informationsdatei »%s« der Laufzeitbibliothek, Zeile %d: ungültige Zeile »%s«"
 
-#: scripts/dpkg-shlibdeps.pl:535
+#: scripts/dpkg-shlibdeps.pl:539
 #, perl-format
 msgid "cannot open file %s"
 msgstr "Kann Datei %s nicht öffnen"
 
-#: scripts/dpkg-shlibdeps.pl:568
+#: scripts/dpkg-shlibdeps.pl:572
 #, perl-format
 msgid ""
 "$ORIGIN is used in RPATH of %s and the corresponding directory could not be "
@@ -1587,28 +1589,28 @@ msgstr ""
 "nicht identifiziert werden, da das DEBIAN-Unterverzeichnis in der Wurzel des "
 "Paketbaubaums fehlt."
 
-#: scripts/dpkg-shlibdeps.pl:615
+#: scripts/dpkg-shlibdeps.pl:619
 msgid "cannot fork for dpkg --search"
 msgstr "kann Fork für »dpkg --search« nicht durchführen"
 
-#: scripts/dpkg-shlibdeps.pl:622
+#: scripts/dpkg-shlibdeps.pl:626
 msgid "cannot exec dpkg"
 msgstr "kann dpkg nicht ausführen"
 
-#: scripts/dpkg-shlibdeps.pl:627
+#: scripts/dpkg-shlibdeps.pl:631
 msgid "diversions involved - output may be incorrect"
 msgstr "Umlenkungen beteiligt - Ausgabe könnte nicht korrekt sein"
 
-#: scripts/dpkg-shlibdeps.pl:629
+#: scripts/dpkg-shlibdeps.pl:633
 msgid "write diversion info to stderr"
 msgstr "schreibe Informationen zu Umlenkungen auf Stderr"
 
-#: scripts/dpkg-shlibdeps.pl:633
+#: scripts/dpkg-shlibdeps.pl:637
 #, perl-format
 msgid "unknown output from dpkg --search: '%s'"
 msgstr "unbekannte Ausgabe von »dpkg --search«: »%s«"
 
-#: scripts/dpkg-source.pl:140
+#: scripts/dpkg-source.pl:141
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson and Klee Dienes."
@@ -1616,7 +1618,7 @@ msgstr ""
 "\n"
 "Copyright (C) 1996 Ian Jackson and Klee Dienes."
 
-#: scripts/dpkg-source.pl:151
+#: scripts/dpkg-source.pl:152
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -1665,882 +1667,882 @@ msgid ""
 "      --version            show the version.\n"
 msgstr ""
 
-#: scripts/dpkg-source.pl:220
+#: scripts/dpkg-source.pl:221
 #, perl-format
 msgid "%s is not a supported compression"
 msgstr "%s ist keine unterstützte Kompression"
 
-#: scripts/dpkg-source.pl:224
+#: scripts/dpkg-source.pl:225
 #, perl-format
 msgid "%s is not a compression level"
 msgstr "%s ist keine Komprimierungsstufe"
 
-#: scripts/dpkg-source.pl:227
+#: scripts/dpkg-source.pl:228
 #, perl-format
 msgid "-s%s option overrides earlier -s%s option"
 msgstr "Option -s%s vorhergehende Option -s%s"
 
-#: scripts/dpkg-source.pl:272
+#: scripts/dpkg-source.pl:273
 msgid "need -x or -b"
 msgstr "benötige -x oder -b"
 
-#: scripts/dpkg-source.pl:280
+#: scripts/dpkg-source.pl:281
 #, perl-format
 msgid "source handling style -s%s not allowed with -b"
 msgstr ""
 
-#: scripts/dpkg-source.pl:283
+#: scripts/dpkg-source.pl:284
 msgid "-b needs a directory"
 msgstr "-b benötigt ein Verzeichnis"
 
-#: scripts/dpkg-source.pl:284
+#: scripts/dpkg-source.pl:285
 msgid "-b takes at most a directory and an orig source argument"
 msgstr ""
 
-#: scripts/dpkg-source.pl:287
+#: scripts/dpkg-source.pl:288
 #, perl-format
 msgid "cannot stat directory %s: %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:288
+#: scripts/dpkg-source.pl:289
 #, perl-format
 msgid "directory argument %s is not a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:346
+#: scripts/dpkg-source.pl:347
 #, perl-format
 msgid "`%s' is not a legal architecture string"
 msgstr "»%s« ist keine gültige Architektur-Zeichenkette"
 
-#: scripts/dpkg-source.pl:349
+#: scripts/dpkg-source.pl:350
 #, perl-format
 msgid "architecture %s only allowed on its own (list for package %s is `%s')"
 msgstr ""
 
-#: scripts/dpkg-source.pl:402
+#: scripts/dpkg-source.pl:403
 msgid "unable to determine source package name !"
 msgstr ""
 
-#: scripts/dpkg-source.pl:423
+#: scripts/dpkg-source.pl:424
 #, perl-format
-msgid "cannot stat orig argument %s: %s"
+msgid "packed orig `%s' exists but is not a plain file"
 msgstr ""
 
 #: scripts/dpkg-source.pl:429
 #, perl-format
+msgid "unable to stat putative packed orig `%s'"
+msgstr ""
+
+#: scripts/dpkg-source.pl:439
+#, perl-format
+msgid "cannot stat orig argument %s: %s"
+msgstr ""
+
+#: scripts/dpkg-source.pl:445
+#, perl-format
 msgid ""
 "orig argument is unpacked but source handling style -s%s calls for packed (."
 "orig.tar.<ext>)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:436
+#: scripts/dpkg-source.pl:452
 #, perl-format
 msgid ""
 "orig argument is packed but source handling style -s%s calls for unpacked (."
 "orig/)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:445
+#: scripts/dpkg-source.pl:461
 #, perl-format
 msgid ""
 "orig argument is empty (means no orig, no diff) but source handling style -s%"
 "s wants something"
 msgstr ""
 
-#: scripts/dpkg-source.pl:453
-#, perl-format
-msgid "packed orig `%s' exists but is not a plain file"
-msgstr ""
-
-#: scripts/dpkg-source.pl:459
-#, perl-format
-msgid "unable to stat putative packed orig `%s'"
-msgstr ""
-
-#: scripts/dpkg-source.pl:464
+#: scripts/dpkg-source.pl:473
 #, perl-format
 msgid "unpacked orig `%s' exists but is not a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:468
+#: scripts/dpkg-source.pl:477
 #, perl-format
 msgid "unable to stat putative unpacked orig `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:480
+#: scripts/dpkg-source.pl:489
 #, perl-format
 msgid "source directory '%s' is not <sourcepackage>-<upstreamversion> '%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:494
+#: scripts/dpkg-source.pl:503
 #, perl-format
 msgid ".orig directory name %s is not <package>-<upstreamversion> (wanted %s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:503
+#: scripts/dpkg-source.pl:512
 #, perl-format
 msgid ""
 ".orig.tar name %s is not <package>_<upstreamversion>.orig.tar (wanted %s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:516
+#: scripts/dpkg-source.pl:525
 #, perl-format
 msgid ""
 "tarfile `%s' already exists, not overwriting, giving up; use -sU or -sR to "
 "override"
 msgstr ""
 
-#: scripts/dpkg-source.pl:519
+#: scripts/dpkg-source.pl:528
 #, perl-format
 msgid "unable to check for existence of `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:522 scripts/dpkg-source.pl:592
-#: scripts/dpkg-source.pl:752
+#: scripts/dpkg-source.pl:531 scripts/dpkg-source.pl:601
+#: scripts/dpkg-source.pl:761
 #, perl-format
 msgid "%s: building %s in %s"
 msgstr "%s: baue %s in %s"
 
-#: scripts/dpkg-source.pl:524
+#: scripts/dpkg-source.pl:533
 msgid "write building tar message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:528
+#: scripts/dpkg-source.pl:537
 msgid "fork for tar"
 msgstr ""
 
-#: scripts/dpkg-source.pl:531
+#: scripts/dpkg-source.pl:540
 #, perl-format
 msgid "chdir to above (orig) source %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:532
+#: scripts/dpkg-source.pl:541
 msgid "reopen gzip for tar"
 msgstr ""
 
-#: scripts/dpkg-source.pl:534
+#: scripts/dpkg-source.pl:543
 msgid "exec tar"
 msgstr "exec tar"
 
-#: scripts/dpkg-source.pl:538
+#: scripts/dpkg-source.pl:547
 msgid "wait for tar"
 msgstr "warte auf tar"
 
-#: scripts/dpkg-source.pl:541 scripts/dpkg-source.pl:713
+#: scripts/dpkg-source.pl:550 scripts/dpkg-source.pl:722
 #, perl-format
 msgid "unable to rename `%s' (newly created) to `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:544 scripts/dpkg-source.pl:716
+#: scripts/dpkg-source.pl:553 scripts/dpkg-source.pl:725
 #, perl-format
 msgid "unable to change permission of `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:548
+#: scripts/dpkg-source.pl:557
 #, perl-format
 msgid "%s: building %s using existing %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:550
+#: scripts/dpkg-source.pl:559
 msgid "write using existing tar message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:560
+#: scripts/dpkg-source.pl:569
 #, perl-format
 msgid ""
 "orig dir `%s' already exists, not overwriting, giving up; use -sA, -sK or -"
 "sP to override"
 msgstr ""
 
-#: scripts/dpkg-source.pl:567
+#: scripts/dpkg-source.pl:576
 #, perl-format
 msgid "unable to check for existence of orig dir `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:577 scripts/dpkg-source.pl:938
+#: scripts/dpkg-source.pl:586 scripts/dpkg-source.pl:947
 #, perl-format
 msgid "unable to create `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:581 scripts/dpkg-source.pl:919
-#: scripts/dpkg-source.pl:942
+#: scripts/dpkg-source.pl:590 scripts/dpkg-source.pl:928
+#: scripts/dpkg-source.pl:951
 #, perl-format
 msgid "unable to rename `%s' to `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:585 scripts/dpkg-source.pl:944
+#: scripts/dpkg-source.pl:594 scripts/dpkg-source.pl:953
 #, perl-format
 msgid "unable to remove `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:594
+#: scripts/dpkg-source.pl:603
 msgid "write building diff message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:599
+#: scripts/dpkg-source.pl:608
 msgid "fork for find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:601
+#: scripts/dpkg-source.pl:610
 #, perl-format
 msgid "chdir to %s for find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:602
+#: scripts/dpkg-source.pl:611
 msgid "exec find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:611
+#: scripts/dpkg-source.pl:620
 #, perl-format
 msgid "cannot stat file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:618
+#: scripts/dpkg-source.pl:627
 #, perl-format
 msgid "cannot read link %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:620
+#: scripts/dpkg-source.pl:629
 #, perl-format
 msgid "cannot read orig link %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:621 scripts/dpkg-source.pl:622
+#: scripts/dpkg-source.pl:630 scripts/dpkg-source.pl:631
 #, perl-format
 msgid "symlink to %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:629 scripts/dpkg-source.pl:700
+#: scripts/dpkg-source.pl:638 scripts/dpkg-source.pl:709
 #, perl-format
 msgid "cannot stat orig file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:632
+#: scripts/dpkg-source.pl:641
 #, perl-format
 msgid "newly created empty file '%s' will not be represented in diff"
 msgstr ""
 
-#: scripts/dpkg-source.pl:636
+#: scripts/dpkg-source.pl:645
 #, perl-format
 msgid "executable mode %04o of '%s' will not be represented in diff"
 msgstr ""
 
-#: scripts/dpkg-source.pl:641
+#: scripts/dpkg-source.pl:650
 #, perl-format
 msgid "special mode %04o of '%s' will not be represented in diff"
 msgstr ""
 
-#: scripts/dpkg-source.pl:648 scripts/dpkg-source.pl:1523
+#: scripts/dpkg-source.pl:657 scripts/dpkg-source.pl:1532
 msgid "something else"
 msgstr ""
 
-#: scripts/dpkg-source.pl:649
+#: scripts/dpkg-source.pl:658
 msgid "plain file"
 msgstr ""
 
-#: scripts/dpkg-source.pl:652
+#: scripts/dpkg-source.pl:661
 msgid "fork for diff"
 msgstr ""
 
-#: scripts/dpkg-source.pl:661
+#: scripts/dpkg-source.pl:670
 msgid "exec diff"
 msgstr ""
 
-#: scripts/dpkg-source.pl:668
+#: scripts/dpkg-source.pl:677
 msgid "binary file contents changed"
 msgstr ""
 
-#: scripts/dpkg-source.pl:673
+#: scripts/dpkg-source.pl:682
 #, perl-format
 msgid "file %s has no final newline (either original or modified version)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:677
+#: scripts/dpkg-source.pl:686
 #, perl-format
 msgid "unknown line from diff -u on %s: `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:680
+#: scripts/dpkg-source.pl:689
 msgid "failed to write to compression pipe"
 msgstr ""
 
-#: scripts/dpkg-source.pl:686
+#: scripts/dpkg-source.pl:695
 msgid "diff gave 1 but no diff lines found"
 msgstr ""
 
-#: scripts/dpkg-source.pl:689
+#: scripts/dpkg-source.pl:698
 #, perl-format
 msgid "diff on %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:695
+#: scripts/dpkg-source.pl:704
 msgid "device or socket is not allowed"
 msgstr ""
 
-#: scripts/dpkg-source.pl:702
+#: scripts/dpkg-source.pl:711
 msgid "not a directory"
 msgstr "kein Verzeichnis"
 
-#: scripts/dpkg-source.pl:703
+#: scripts/dpkg-source.pl:712
 msgid "directory"
 msgstr "Verzeichnis"
 
-#: scripts/dpkg-source.pl:706
+#: scripts/dpkg-source.pl:715
 #, perl-format
 msgid "unknown file type (%s)"
 msgstr "unbekannter Dateityp (%s)"
 
-#: scripts/dpkg-source.pl:710
+#: scripts/dpkg-source.pl:719
 msgid "finish write to compression pipe"
 msgstr ""
 
-#: scripts/dpkg-source.pl:718
+#: scripts/dpkg-source.pl:727
 msgid "fork for 2nd find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:720
+#: scripts/dpkg-source.pl:729
 #, perl-format
 msgid "chdir to %s for 2nd find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:721
+#: scripts/dpkg-source.pl:730
 msgid "exec 2nd find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:730
+#: scripts/dpkg-source.pl:739
 #, perl-format
 msgid "cannot check orig file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:732
+#: scripts/dpkg-source.pl:741
 #, perl-format
 msgid "ignoring deletion of file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:734
+#: scripts/dpkg-source.pl:743
 #, perl-format
 msgid "ignoring deletion of directory %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:736
+#: scripts/dpkg-source.pl:745
 #, perl-format
 msgid "ignoring deletion of symlink %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:738
+#: scripts/dpkg-source.pl:747
 msgid "not a file, directory or link"
 msgstr ""
 
-#: scripts/dpkg-source.pl:739 scripts/dpkg-source.pl:1518
+#: scripts/dpkg-source.pl:748 scripts/dpkg-source.pl:1527
 msgid "nonexistent"
 msgstr ""
 
-#: scripts/dpkg-source.pl:754
+#: scripts/dpkg-source.pl:763
 msgid "write building message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:756
+#: scripts/dpkg-source.pl:765
 #, perl-format
 msgid "create %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:762
+#: scripts/dpkg-source.pl:771
 #, perl-format
 msgid "%s: unrepresentable changes to source"
 msgstr ""
 
-#: scripts/dpkg-source.pl:763
+#: scripts/dpkg-source.pl:772
 #, perl-format
 msgid "write error msg: %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:772
+#: scripts/dpkg-source.pl:781
 #, perl-format
 msgid "source handling style -s%s not allowed with -x"
 msgstr ""
 
-#: scripts/dpkg-source.pl:775
+#: scripts/dpkg-source.pl:784
 msgid "-x needs at least one argument, the .dsc"
 msgstr ""
 
-#: scripts/dpkg-source.pl:776
+#: scripts/dpkg-source.pl:785
 msgid "-x takes no more than two arguments"
 msgstr ""
 
-#: scripts/dpkg-source.pl:780
+#: scripts/dpkg-source.pl:789
 msgid "-x needs the .dsc file as first argument, not a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:788
+#: scripts/dpkg-source.pl:797
 #, perl-format
 msgid "unpack target exists: %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:792 scripts/dpkg-source.pl:823
+#: scripts/dpkg-source.pl:801 scripts/dpkg-source.pl:832
 #, perl-format
 msgid "cannot open .dsc file %s: %s"
 msgstr "kann .dsc-Datei %s nicht öffnen: %s"
 
-#: scripts/dpkg-source.pl:812
+#: scripts/dpkg-source.pl:821
 #, perl-format
 msgid "failed to verify signature on %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:816
+#: scripts/dpkg-source.pl:825
 #, perl-format
 msgid "could not verify signature on %s since gpg isn't installed"
 msgstr ""
 
-#: scripts/dpkg-source.pl:820
+#: scripts/dpkg-source.pl:829
 #, perl-format
 msgid "extracting unsigned source package (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:829
+#: scripts/dpkg-source.pl:838
 #, perl-format
 msgid "missing critical source control field %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:835
+#: scripts/dpkg-source.pl:844
 #, perl-format
 msgid "Unsupported format of .dsc file (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:867
+#: scripts/dpkg-source.pl:876
 #, perl-format
 msgid "Files field contains invalid filename `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:872
+#: scripts/dpkg-source.pl:881
 #, perl-format
 msgid "repeated file type - files `%s' and `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:886
+#: scripts/dpkg-source.pl:895
 #, perl-format
 msgid "unrecognised file type - `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:890
+#: scripts/dpkg-source.pl:899
 msgid "no tarfile in Files field"
 msgstr ""
 
-#: scripts/dpkg-source.pl:893
+#: scripts/dpkg-source.pl:902
 msgid "multiple tarfiles in native package"
 msgstr ""
 
-#: scripts/dpkg-source.pl:894
+#: scripts/dpkg-source.pl:903
 msgid "native package with .orig.tar"
 msgstr ""
 
-#: scripts/dpkg-source.pl:897
+#: scripts/dpkg-source.pl:906
 msgid "no upstream tarfile in Files field"
 msgstr ""
 
-#: scripts/dpkg-source.pl:900
+#: scripts/dpkg-source.pl:909
 #, perl-format
 msgid "multiple upstream tarballs in %s format dsc"
 msgstr ""
 
-#: scripts/dpkg-source.pl:902
+#: scripts/dpkg-source.pl:911
 #, perl-format
 msgid "debian.tar in %s format dsc"
 msgstr ""
 
-#: scripts/dpkg-source.pl:912
+#: scripts/dpkg-source.pl:921
 #, perl-format
 msgid "%s: extracting %s in %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:914
+#: scripts/dpkg-source.pl:923
 msgid "write extracting message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:939
+#: scripts/dpkg-source.pl:948
 #, perl-format
 msgid "%s: unpacking %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:952
+#: scripts/dpkg-source.pl:961
 #, perl-format
 msgid "failed to stat `%s' to see if need to copy"
 msgstr ""
 
-#: scripts/dpkg-source.pl:964
+#: scripts/dpkg-source.pl:973
 #, perl-format
 msgid "failed to check destination `%s' to see if need to copy"
 msgstr ""
 
-#: scripts/dpkg-source.pl:977
+#: scripts/dpkg-source.pl:986
 msgid "unable to keep orig directory (already exists)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1011 scripts/dpkg-source.pl:1071
+#: scripts/dpkg-source.pl:1020 scripts/dpkg-source.pl:1080
 #, perl-format
 msgid "cannot stat %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1013
+#: scripts/dpkg-source.pl:1022
 #, perl-format
 msgid "failed to create %s subdirectory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1016
+#: scripts/dpkg-source.pl:1025
 #, perl-format
 msgid "diff patches file in directory `%s', but %s isn't a directory !"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1026
+#: scripts/dpkg-source.pl:1035
 #, perl-format
 msgid "failed to rename newly-extracted %s to %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1032
+#: scripts/dpkg-source.pl:1041
 #, perl-format
 msgid "failed to rename saved %s to %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1037
+#: scripts/dpkg-source.pl:1046
 #, perl-format
 msgid "%s: applying %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1042 scripts/dpkg-source.pl:1353
+#: scripts/dpkg-source.pl:1051 scripts/dpkg-source.pl:1362
 #, perl-format
 msgid "can't open diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1045
+#: scripts/dpkg-source.pl:1054
 msgid "fork for patch"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1047
+#: scripts/dpkg-source.pl:1056
 msgid "reopen gzip for patch"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1048
+#: scripts/dpkg-source.pl:1057
 #, perl-format
 msgid "chdir to %s for patch"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1052
+#: scripts/dpkg-source.pl:1061
 msgid "exec patch"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1055
+#: scripts/dpkg-source.pl:1064
 msgid "wait for patch"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1065
+#: scripts/dpkg-source.pl:1074
 #, perl-format
 msgid "cannot change timestamp for %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1067
+#: scripts/dpkg-source.pl:1076
 #, perl-format
 msgid "remove patch backup file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1072
+#: scripts/dpkg-source.pl:1081
 #, perl-format
 msgid "%s does not exist"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1075
+#: scripts/dpkg-source.pl:1084
 #, perl-format
 msgid "cannot make %s executable"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1077
+#: scripts/dpkg-source.pl:1086
 #, perl-format
 msgid "%s is not a plain file"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1081
+#: scripts/dpkg-source.pl:1090
 msgid "cannot stat `.'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1089
+#: scripts/dpkg-source.pl:1098
 #, perl-format
 msgid "cannot stat extracted object `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1100
+#: scripts/dpkg-source.pl:1109
 #, perl-format
 msgid "unknown object `%s' after extract (mode 0%o)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1105
+#: scripts/dpkg-source.pl:1114
 #, perl-format
 msgid "cannot change mode of `%s' to 0%o from 0%o"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1116
+#: scripts/dpkg-source.pl:1125
 #, perl-format
 msgid "cannot read %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1117
+#: scripts/dpkg-source.pl:1126
 #, perl-format
 msgid "cannot fstat %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1118
+#: scripts/dpkg-source.pl:1127
 #, perl-format
 msgid "file %s has size %s instead of expected %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1122
+#: scripts/dpkg-source.pl:1131
 #, perl-format
 msgid "file %s has md5sum %s instead of expected %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1124
+#: scripts/dpkg-source.pl:1133
 msgid "reopen stdin from /dev/null"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1131
+#: scripts/dpkg-source.pl:1140
 #, perl-format
 msgid "cannot stat directory %s (before removal)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1137
+#: scripts/dpkg-source.pl:1146
 #, perl-format
 msgid "unable to check for removal of dir `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1139
+#: scripts/dpkg-source.pl:1148
 #, perl-format
 msgid "rm -rf failed to remove `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1151
+#: scripts/dpkg-source.pl:1160
 msgid "fork for cpio"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1155
+#: scripts/dpkg-source.pl:1164
 msgid "reopen gzip for cpio"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1157
+#: scripts/dpkg-source.pl:1166
 msgid "exec cpio"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1171
+#: scripts/dpkg-source.pl:1180
 #, perl-format
 msgid "tarfile `%s' contains object with newline in its name (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1179
+#: scripts/dpkg-source.pl:1188
 #, perl-format
 msgid ""
 "first output from cpio -0t (from `%s') contains newline - you probably have "
 "an out of date version of cpio.  GNU cpio 2.4.2-2 is known to work"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1188
+#: scripts/dpkg-source.pl:1197
 #, perl-format
 msgid ""
 "tarfile `%s' does not extract into a directory off the current directory (%s "
 "from %s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1197
+#: scripts/dpkg-source.pl:1206
 #, perl-format
 msgid "tarfile `%s' contains object (%s) not in expected directory (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1203 scripts/dpkg-source.pl:1303
+#: scripts/dpkg-source.pl:1212 scripts/dpkg-source.pl:1312
 #, perl-format
 msgid "tarfile `%s' contains object with /../ in its name (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1230
+#: scripts/dpkg-source.pl:1239
 msgid "fork for tar -t"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1234
+#: scripts/dpkg-source.pl:1243
 msgid "reopen gzip for tar -t"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1235
+#: scripts/dpkg-source.pl:1244
 msgid "exec tar -vvtf -"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1245
+#: scripts/dpkg-source.pl:1254
 #, perl-format
 msgid "tarfile `%s' contains unknown object listed by tar as `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1252
+#: scripts/dpkg-source.pl:1261
 #, perl-format
 msgid "tarfile `%s' contains object `%s' with unknown or forbidden type `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1262
+#: scripts/dpkg-source.pl:1271
 #, perl-format
 msgid "tarfile `%s' contains incomplete entry `%s'\n"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1286
+#: scripts/dpkg-source.pl:1295
 #, perl-format
 msgid "filename '%s' was truncated by cpio; unable to check full pathname"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1293
+#: scripts/dpkg-source.pl:1302
 #, perl-format
 msgid ""
 "tarfile `%s' contains unexpected object listed by tar as `%s'; expected `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1308
+#: scripts/dpkg-source.pl:1317
 #, perl-format
 msgid "tarfile `%s' contains file with name ending in .dpkg-orig"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1313
+#: scripts/dpkg-source.pl:1322
 #, perl-format
 msgid "tarfile `%s' contains setuid, setgid or sticky object `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1318
+#: scripts/dpkg-source.pl:1327
 #, perl-format
 msgid "tarfile `%s' contains object `debian' that isn't a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1327
+#: scripts/dpkg-source.pl:1336
 #, perl-format
 msgid ""
 "tarfile `%s' contains object `%s' but its containing directory `%s' does not "
 "precede it"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1365 scripts/dpkg-source.pl:1410
-#: scripts/dpkg-source.pl:1421
+#: scripts/dpkg-source.pl:1374 scripts/dpkg-source.pl:1419
+#: scripts/dpkg-source.pl:1430
 #, perl-format
 msgid "diff `%s' is missing trailing newline"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1367
+#: scripts/dpkg-source.pl:1376
 #, perl-format
 msgid "expected ^--- in line %d of diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1370
+#: scripts/dpkg-source.pl:1379
 #, perl-format
 msgid "diff `%s' patches file with no subdirectory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1372
+#: scripts/dpkg-source.pl:1381
 #, perl-format
 msgid "diff `%s' patches file with name ending .dpkg-orig"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1377
+#: scripts/dpkg-source.pl:1386
 #, perl-format
 msgid "diff `%s' finishes in middle of ---/+++ (line %d)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1382 scripts/dpkg-source.pl:1389
+#: scripts/dpkg-source.pl:1391 scripts/dpkg-source.pl:1398
 #, perl-format
 msgid "line after --- isn't as expected in diff `%s' (line %d)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1398
+#: scripts/dpkg-source.pl:1407
 #, perl-format
 msgid "diff `%s' patches something which is not a plain file"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1403
+#: scripts/dpkg-source.pl:1412
 #, perl-format
 msgid "diff patches file %s twice"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1413
+#: scripts/dpkg-source.pl:1422
 #, perl-format
 msgid "Expected ^@@ in line %d of diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1419
+#: scripts/dpkg-source.pl:1428
 #, perl-format
 msgid "unexpected end of diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1427
+#: scripts/dpkg-source.pl:1436
 #, perl-format
 msgid "expected [ +-] at start of line %d of diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1432
+#: scripts/dpkg-source.pl:1441
 #, perl-format
 msgid "expected ^@@ at line %d of diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1443
+#: scripts/dpkg-source.pl:1452
 msgid "fork for tar -xkf -"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1445
+#: scripts/dpkg-source.pl:1454
 msgid "reopen gzip for tar -xkf -"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1448
+#: scripts/dpkg-source.pl:1457
 #, perl-format
 msgid "cannot chdir to `%s' for tar extract"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1450
+#: scripts/dpkg-source.pl:1459
 msgid "exec tar -xkf -"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1453
+#: scripts/dpkg-source.pl:1462
 msgid "wait for tar -xkf -"
 msgstr "Warte auf tar -xkf -"
 
-#: scripts/dpkg-source.pl:1485
+#: scripts/dpkg-source.pl:1494
 #, perl-format
 msgid "Unable to open dir %s"
 msgstr "Kann Verzeichnis %s nicht öffnen"
 
-#: scripts/dpkg-source.pl:1487
+#: scripts/dpkg-source.pl:1496
 #, perl-format
 msgid "Unable to close dir %s"
 msgstr "Kann Verzeichnis %s nicht schließen"
 
-#: scripts/dpkg-source.pl:1490 scripts/dpkg-source.pl:1498
-#: scripts/dpkg-source.pl:1503
+#: scripts/dpkg-source.pl:1499 scripts/dpkg-source.pl:1507
+#: scripts/dpkg-source.pl:1512
 #, perl-format
 msgid "Unable to rename %s to %s"
 msgstr "Kann %s nicht in %s umbenennen"
 
-#: scripts/dpkg-source.pl:1495
+#: scripts/dpkg-source.pl:1504
 #, perl-format
 msgid "Unable to mkdir %s"
 msgstr "Kann %s nicht erstellen"
 
-#: scripts/dpkg-source.pl:1511
+#: scripts/dpkg-source.pl:1520
 msgid "reopen stderr for tar to grep out blocks message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1521
+#: scripts/dpkg-source.pl:1530
 #, perl-format
 msgid "checktype %s (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1529
+#: scripts/dpkg-source.pl:1538
 msgid "only one of -x or -b allowed, and only once"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1534
+#: scripts/dpkg-source.pl:1543
 #, perl-format
 msgid "%s: cannot represent change to %s: %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1536 scripts/dpkg-source.pl:1545
+#: scripts/dpkg-source.pl:1545 scripts/dpkg-source.pl:1554
 msgid "write syserr unrep"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1541
+#: scripts/dpkg-source.pl:1550
 #, perl-format
 msgid ""
 "%s: cannot represent change to %s:\n"
@@ -2548,80 +2550,80 @@ msgid ""
 "%s:  old version is %s\n"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1563 scripts/dpkg-source.pl:1594
+#: scripts/dpkg-source.pl:1572 scripts/dpkg-source.pl:1603
 #, perl-format
 msgid "unknown compression type on file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1570
+#: scripts/dpkg-source.pl:1579
 #, perl-format
 msgid "create file %s"
 msgstr "erstelle Datei %s"
 
-#: scripts/dpkg-source.pl:1571
+#: scripts/dpkg-source.pl:1580
 msgid "pipe for gzip"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1572
+#: scripts/dpkg-source.pl:1581
 msgid "fork for gzip"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1574
+#: scripts/dpkg-source.pl:1583
 msgid "reopen gzip pipe"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1576
+#: scripts/dpkg-source.pl:1585
 msgid "reopen tar"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1577
+#: scripts/dpkg-source.pl:1586
 msgid "exec gzip"
 msgstr "exec gzip"
 
-#: scripts/dpkg-source.pl:1597
+#: scripts/dpkg-source.pl:1606
 #, perl-format
 msgid "read file %s"
 msgstr "lese Datei %s"
 
-#: scripts/dpkg-source.pl:1598
+#: scripts/dpkg-source.pl:1607
 #, perl-format
 msgid "pipe for %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1599
+#: scripts/dpkg-source.pl:1608
 #, perl-format
 msgid "fork for %s"
 msgstr "Fork für %s"
 
-#: scripts/dpkg-source.pl:1601
+#: scripts/dpkg-source.pl:1610
 #, perl-format
 msgid "reopen %s pipe"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1603
+#: scripts/dpkg-source.pl:1612
 msgid "reopen input file"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1604
+#: scripts/dpkg-source.pl:1613
 #, perl-format
 msgid "exec %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1611
+#: scripts/dpkg-source.pl:1620
 msgid "wait for gzip"
 msgstr "Warte auf gzip"
 
-#: scripts/dpkg-source.pl:1621
+#: scripts/dpkg-source.pl:1630
 #, perl-format
 msgid "tried to add file `%s' twice"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1622
+#: scripts/dpkg-source.pl:1631
 #, perl-format
 msgid "could not stat output file `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1643
+#: scripts/dpkg-source.pl:1652
 #, perl-format
 msgid "bogus character `\\%s' in `%s'"
 msgstr ""
@@ -2774,27 +2776,27 @@ msgstr "Kann objdump nicht ausf
 msgid "Couldn't parse dynamic symbol definition: %s"
 msgstr "Konnte die Definition der dynamischen Symbole nicht auswerten: %s"
 
-#: scripts/Dpkg/Shlibs/SymbolFile.pm:101
+#: scripts/Dpkg/Shlibs/SymbolFile.pm:103
 #, perl-format
 msgid "Can't open %s: %s"
 msgstr "Kann %s nicht öffnen: %s"
 
-#: scripts/Dpkg/Shlibs/SymbolFile.pm:107
+#: scripts/Dpkg/Shlibs/SymbolFile.pm:109
 #, perl-format
 msgid "Symbol information must be preceded by a header (file %s, line %s)."
 msgstr ""
 
-#: scripts/Dpkg/Shlibs/SymbolFile.pm:147
+#: scripts/Dpkg/Shlibs/SymbolFile.pm:149
 #, perl-format
 msgid "Failed to parse a line in %s: %s"
 msgstr "Konnte eine Zeile in %s nicht auswerten: %s"
 
-#: scripts/Dpkg/Shlibs/SymbolFile.pm:161
+#: scripts/Dpkg/Shlibs/SymbolFile.pm:163
 #, perl-format
 msgid "Can't open %s for writing: %s"
 msgstr "Kann %s nicht zum Schreiben öffnen: %s"
 
-#: scripts/Dpkg/Shlibs/SymbolFile.pm:194
+#: scripts/Dpkg/Shlibs/SymbolFile.pm:196
 msgid "Can't merge symbols from objects without SONAME."
 msgstr "Kann Symbole von Objekten ohne SONAME nicht zusammenführen."
 
diff --git a/scripts/po/dpkg-dev.pot b/scripts/po/dpkg-dev.pot
index 7b8a347a..0e76f6b2 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-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\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"
@@ -111,8 +111,8 @@ msgstr ""
 msgid "fork for parse changelog"
 msgstr ""
 
-#: scripts/controllib.pl:191 scripts/dpkg-genchanges.pl:305
-#: scripts/dpkg-gencontrol.pl:220 scripts/dpkg-source.pl:380
+#: scripts/controllib.pl:191 scripts/dpkg-genchanges.pl:306
+#: scripts/dpkg-gencontrol.pl:220 scripts/dpkg-source.pl:381
 msgid "parsed version of changelog"
 msgstr ""
 
@@ -184,11 +184,11 @@ msgid "syntax error in %s at line %d: %s"
 msgstr ""
 
 #: scripts/dpkg-architecture.pl:35 scripts/dpkg-buildpackage.pl:21
-#: scripts/dpkg-distaddfile.pl:21 scripts/dpkg-genchanges.pl:82
+#: scripts/dpkg-distaddfile.pl:21 scripts/dpkg-genchanges.pl:83
 #: scripts/dpkg-gencontrol.pl:50 scripts/dpkg-gensymbols.pl:36
 #: scripts/dpkg-parsechangelog.pl:24 scripts/dpkg-scanpackages.pl:51
-#: scripts/dpkg-scansources.pl:96 scripts/dpkg-shlibdeps.pl:357
-#: scripts/dpkg-source.pl:138 scripts/changelog/debian.pl:31
+#: scripts/dpkg-scansources.pl:96 scripts/dpkg-shlibdeps.pl:359
+#: scripts/dpkg-source.pl:139 scripts/changelog/debian.pl:31
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr ""
@@ -201,10 +201,10 @@ msgid ""
 msgstr ""
 
 #: scripts/dpkg-architecture.pl:41 scripts/dpkg-buildpackage.pl:28
-#: scripts/dpkg-distaddfile.pl:26 scripts/dpkg-genchanges.pl:88
+#: scripts/dpkg-distaddfile.pl:26 scripts/dpkg-genchanges.pl:89
 #: scripts/dpkg-gencontrol.pl:56 scripts/dpkg-gensymbols.pl:42
-#: scripts/dpkg-parsechangelog.pl:30 scripts/dpkg-shlibdeps.pl:366
-#: scripts/dpkg-source.pl:143 scripts/changelog/debian.pl:35
+#: scripts/dpkg-parsechangelog.pl:30 scripts/dpkg-shlibdeps.pl:368
+#: scripts/dpkg-source.pl:144 scripts/changelog/debian.pl:35
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -235,9 +235,9 @@ msgid ""
 msgstr ""
 
 #: scripts/dpkg-architecture.pl:120 scripts/dpkg-distaddfile.pl:54
-#: scripts/dpkg-genchanges.pl:177 scripts/dpkg-gencontrol.pl:129
+#: scripts/dpkg-genchanges.pl:178 scripts/dpkg-gencontrol.pl:129
 #: scripts/dpkg-gensymbols.pl:108 scripts/dpkg-shlibdeps.pl:82
-#: scripts/dpkg-source.pl:268 scripts/changelog/debian.pl:64
+#: scripts/dpkg-source.pl:269 scripts/changelog/debian.pl:64
 #, perl-format
 msgid "unknown option `%s'"
 msgstr ""
@@ -465,7 +465,7 @@ msgid "%s: Build conflicts: "
 msgstr ""
 
 #: scripts/dpkg-checkbuilddeps.pl:157 scripts/dpkg-gencontrol.pl:261
-#: scripts/dpkg-gencontrol.pl:268 scripts/dpkg-source.pl:319
+#: scripts/dpkg-gencontrol.pl:268 scripts/dpkg-source.pl:320
 #, perl-format
 msgid "error occurred while parsing %s"
 msgstr ""
@@ -519,14 +519,14 @@ msgstr ""
 msgid "close new files list file"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:84
+#: scripts/dpkg-genchanges.pl:85
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:96
+#: scripts/dpkg-genchanges.pl:97
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...]\n"
@@ -558,165 +558,165 @@ msgid ""
 "      --version            show the version.\n"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:129 scripts/dpkg-genchanges.pl:132
-#: scripts/dpkg-genchanges.pl:136 scripts/dpkg-genchanges.pl:140
+#: scripts/dpkg-genchanges.pl:130 scripts/dpkg-genchanges.pl:133
+#: scripts/dpkg-genchanges.pl:137 scripts/dpkg-genchanges.pl:141
 #, perl-format
 msgid "cannot combine %s and -S"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:134
+#: scripts/dpkg-genchanges.pl:135
 #, perl-format
 msgid "%s: arch-specific upload - not including arch-independent packages"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:138
+#: scripts/dpkg-genchanges.pl:139
 #, perl-format
 msgid "%s: arch-indep upload - not including arch-specific packages"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:185
+#: scripts/dpkg-genchanges.pl:186
 msgid "cannot read files list file"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:189
+#: scripts/dpkg-genchanges.pl:190
 #, perl-format
 msgid "duplicate files list entry for package %s (line %d)"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:197 scripts/dpkg-genchanges.pl:211
+#: scripts/dpkg-genchanges.pl:198 scripts/dpkg-genchanges.pl:212
 #, perl-format
 msgid "duplicate files list entry for file %s (line %d)"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:217
+#: scripts/dpkg-genchanges.pl:218
 #, perl-format
 msgid "badly formed line in files list file, line %d"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:238 scripts/dpkg-gencontrol.pl:174
-#: scripts/dpkg-source.pl:327
+#: scripts/dpkg-genchanges.pl:239 scripts/dpkg-gencontrol.pl:174
+#: scripts/dpkg-source.pl:328
 msgid "general section of control info file"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:249
+#: scripts/dpkg-genchanges.pl:250
 #, perl-format
 msgid "package %s in control file but not in files list"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:292 scripts/dpkg-gencontrol.pl:205
-#: scripts/dpkg-source.pl:367
+#: scripts/dpkg-genchanges.pl:293 scripts/dpkg-gencontrol.pl:205
+#: scripts/dpkg-source.pl:368
 msgid "package's section of control info file"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:316
+#: scripts/dpkg-genchanges.pl:317
 msgid "read changesdescription"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:327
+#: scripts/dpkg-genchanges.pl:328
 #, perl-format
 msgid "package %s listed in files list but not in control info"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:339
+#: scripts/dpkg-genchanges.pl:340
 #, perl-format
 msgid "missing Section for binary package %s; using '-'"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:341
+#: scripts/dpkg-genchanges.pl:342
 #, perl-format
 msgid "package %s has section %s in control file but %s in files list"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:348
+#: scripts/dpkg-genchanges.pl:349
 #, perl-format
 msgid "missing Priority for binary package %s; using '-'"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:350
+#: scripts/dpkg-genchanges.pl:351
 #, perl-format
 msgid "package %s has priority %s in control file but %s in files list"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:365
+#: scripts/dpkg-genchanges.pl:366
 msgid "missing Section for source files"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:370
+#: scripts/dpkg-genchanges.pl:371
 msgid "missing Priority for source files"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:375
+#: scripts/dpkg-genchanges.pl:376
 #, perl-format
 msgid "cannot open .dsc file %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:378 scripts/dpkg-source.pl:824
+#: scripts/dpkg-genchanges.pl:379 scripts/dpkg-source.pl:833
 #, perl-format
 msgid "source control file %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:384 scripts/dpkg-source.pl:863
+#: scripts/dpkg-genchanges.pl:385 scripts/dpkg-source.pl:872
 #, perl-format
 msgid "Files field contains bad line `%s'"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:396
+#: scripts/dpkg-genchanges.pl:397
 msgid "not including original source code in upload"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:401
+#: scripts/dpkg-genchanges.pl:402
 msgid "ignoring -sd option for native Debian package"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:403
+#: scripts/dpkg-genchanges.pl:404
 msgid "including full source code in upload"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:406
+#: scripts/dpkg-genchanges.pl:407
 msgid "binary-only upload - not including any source code"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:410
+#: scripts/dpkg-genchanges.pl:411
 msgid "write original source message"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:440
+#: scripts/dpkg-genchanges.pl:441
 #, perl-format
 msgid "cannot open upload file %s for reading"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:441
+#: scripts/dpkg-genchanges.pl:442
 #, perl-format
 msgid "cannot fstat upload file %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:443
+#: scripts/dpkg-genchanges.pl:444
 #, perl-format
 msgid "upload file %s is empty"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:445
+#: scripts/dpkg-genchanges.pl:446
 #, perl-format
 msgid "md5sum upload file %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:447
+#: scripts/dpkg-genchanges.pl:448
 #, perl-format
 msgid "md5sum upload file %s gave strange output `%s'"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:451
+#: scripts/dpkg-genchanges.pl:452
 #, perl-format
 msgid "md5sum of source file %s (%s) is different from md5sum in %s (%s)"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:466 scripts/dpkg-source.pl:396
+#: scripts/dpkg-genchanges.pl:467 scripts/dpkg-source.pl:397
 #, perl-format
 msgid "missing information for critical output field %s"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl:471 scripts/dpkg-gencontrol.pl:278
-#: scripts/dpkg-gencontrol.pl:281 scripts/dpkg-source.pl:400
+#: scripts/dpkg-genchanges.pl:472 scripts/dpkg-gencontrol.pl:278
+#: scripts/dpkg-gencontrol.pl:281 scripts/dpkg-source.pl:401
 #, perl-format
 msgid "missing information for output field %s"
 msgstr ""
@@ -781,7 +781,7 @@ msgid ""
 "list (%s)"
 msgstr ""
 
-#: scripts/dpkg-gencontrol.pl:224 scripts/dpkg-source.pl:384
+#: scripts/dpkg-gencontrol.pl:224 scripts/dpkg-source.pl:385
 #, perl-format
 msgid "value from nowhere, with key >%s< and value >%s<"
 msgstr ""
@@ -1254,7 +1254,7 @@ msgstr ""
 msgid "need at least one executable"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:115
+#: scripts/dpkg-shlibdeps.pl:116
 #, perl-format
 msgid ""
 "couldn't find library %s needed by %s (its RPATH is '%s').\n"
@@ -1264,47 +1264,47 @@ msgid ""
 "LD_LIBRARY_PATH."
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:198
+#: scripts/dpkg-shlibdeps.pl:200
 #, perl-format
 msgid "no dependency information found for %s (used by %s)."
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:238
+#: scripts/dpkg-shlibdeps.pl:240
 #, perl-format
 msgid "symbol %s used by %s found in none of the libraries."
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:251
+#: scripts/dpkg-shlibdeps.pl:253
 #, perl-format
 msgid "%d other similar warnings have been skipped (use -v to see them all)."
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:271
+#: scripts/dpkg-shlibdeps.pl:273
 #, perl-format
 msgid "%s shouldn't be linked with %s (it uses none of its symbols)."
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:283
+#: scripts/dpkg-shlibdeps.pl:285
 #, perl-format
 msgid "open new substvars file `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:286
+#: scripts/dpkg-shlibdeps.pl:288
 #, perl-format
 msgid "open old varlist file `%s' for reading"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:289
+#: scripts/dpkg-shlibdeps.pl:291
 #, perl-format
 msgid "copy old entry to new varlist file `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:349
+#: scripts/dpkg-shlibdeps.pl:351
 #, perl-format
 msgid "install new varlist file `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:359
+#: scripts/dpkg-shlibdeps.pl:361
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson.\n"
@@ -1313,7 +1313,7 @@ msgid ""
 "Copyright (C) 2007 Raphael Hertzog.\n"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:374
+#: scripts/dpkg-shlibdeps.pl:376
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <executable>|-e<executable> [<option> ...]\n"
@@ -1338,27 +1338,27 @@ msgid ""
 "  %s\n"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:481
+#: scripts/dpkg-shlibdeps.pl:485
 #, perl-format
 msgid "Can't extract name and version from library name `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:488
+#: scripts/dpkg-shlibdeps.pl:492
 #, perl-format
 msgid "unable to open shared libs info file `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:494
+#: scripts/dpkg-shlibdeps.pl:498
 #, perl-format
 msgid "shared libs info file `%s' line %d: bad line `%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:535
+#: scripts/dpkg-shlibdeps.pl:539
 #, perl-format
 msgid "cannot open file %s"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:568
+#: scripts/dpkg-shlibdeps.pl:572
 #, perl-format
 msgid ""
 "$ORIGIN is used in RPATH of %s and the corresponding directory could not be "
@@ -1366,34 +1366,34 @@ msgid ""
 "build tree"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:615
+#: scripts/dpkg-shlibdeps.pl:619
 msgid "cannot fork for dpkg --search"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:622
+#: scripts/dpkg-shlibdeps.pl:626
 msgid "cannot exec dpkg"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:627
+#: scripts/dpkg-shlibdeps.pl:631
 msgid "diversions involved - output may be incorrect"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:629
+#: scripts/dpkg-shlibdeps.pl:633
 msgid "write diversion info to stderr"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:633
+#: scripts/dpkg-shlibdeps.pl:637
 #, perl-format
 msgid "unknown output from dpkg --search: '%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:140
+#: scripts/dpkg-source.pl:141
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson and Klee Dienes."
 msgstr ""
 
-#: scripts/dpkg-source.pl:151
+#: scripts/dpkg-source.pl:152
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -1442,882 +1442,882 @@ msgid ""
 "      --version            show the version.\n"
 msgstr ""
 
-#: scripts/dpkg-source.pl:220
+#: scripts/dpkg-source.pl:221
 #, perl-format
 msgid "%s is not a supported compression"
 msgstr ""
 
-#: scripts/dpkg-source.pl:224
+#: scripts/dpkg-source.pl:225
 #, perl-format
 msgid "%s is not a compression level"
 msgstr ""
 
-#: scripts/dpkg-source.pl:227
+#: scripts/dpkg-source.pl:228
 #, perl-format
 msgid "-s%s option overrides earlier -s%s option"
 msgstr ""
 
-#: scripts/dpkg-source.pl:272
+#: scripts/dpkg-source.pl:273
 msgid "need -x or -b"
 msgstr ""
 
-#: scripts/dpkg-source.pl:280
+#: scripts/dpkg-source.pl:281
 #, perl-format
 msgid "source handling style -s%s not allowed with -b"
 msgstr ""
 
-#: scripts/dpkg-source.pl:283
+#: scripts/dpkg-source.pl:284
 msgid "-b needs a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:284
+#: scripts/dpkg-source.pl:285
 msgid "-b takes at most a directory and an orig source argument"
 msgstr ""
 
-#: scripts/dpkg-source.pl:287
+#: scripts/dpkg-source.pl:288
 #, perl-format
 msgid "cannot stat directory %s: %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:288
+#: scripts/dpkg-source.pl:289
 #, perl-format
 msgid "directory argument %s is not a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:346
+#: scripts/dpkg-source.pl:347
 #, perl-format
 msgid "`%s' is not a legal architecture string"
 msgstr ""
 
-#: scripts/dpkg-source.pl:349
+#: scripts/dpkg-source.pl:350
 #, perl-format
 msgid "architecture %s only allowed on its own (list for package %s is `%s')"
 msgstr ""
 
-#: scripts/dpkg-source.pl:402
+#: scripts/dpkg-source.pl:403
 msgid "unable to determine source package name !"
 msgstr ""
 
-#: scripts/dpkg-source.pl:423
+#: scripts/dpkg-source.pl:424
 #, perl-format
-msgid "cannot stat orig argument %s: %s"
+msgid "packed orig `%s' exists but is not a plain file"
 msgstr ""
 
 #: scripts/dpkg-source.pl:429
 #, perl-format
+msgid "unable to stat putative packed orig `%s'"
+msgstr ""
+
+#: scripts/dpkg-source.pl:439
+#, perl-format
+msgid "cannot stat orig argument %s: %s"
+msgstr ""
+
+#: scripts/dpkg-source.pl:445
+#, perl-format
 msgid ""
 "orig argument is unpacked but source handling style -s%s calls for packed (."
 "orig.tar.<ext>)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:436
+#: scripts/dpkg-source.pl:452
 #, perl-format
 msgid ""
 "orig argument is packed but source handling style -s%s calls for unpacked (."
 "orig/)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:445
+#: scripts/dpkg-source.pl:461
 #, perl-format
 msgid ""
 "orig argument is empty (means no orig, no diff) but source handling style -s%"
 "s wants something"
 msgstr ""
 
-#: scripts/dpkg-source.pl:453
-#, perl-format
-msgid "packed orig `%s' exists but is not a plain file"
-msgstr ""
-
-#: scripts/dpkg-source.pl:459
-#, perl-format
-msgid "unable to stat putative packed orig `%s'"
-msgstr ""
-
-#: scripts/dpkg-source.pl:464
+#: scripts/dpkg-source.pl:473
 #, perl-format
 msgid "unpacked orig `%s' exists but is not a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:468
+#: scripts/dpkg-source.pl:477
 #, perl-format
 msgid "unable to stat putative unpacked orig `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:480
+#: scripts/dpkg-source.pl:489
 #, perl-format
 msgid "source directory '%s' is not <sourcepackage>-<upstreamversion> '%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:494
+#: scripts/dpkg-source.pl:503
 #, perl-format
 msgid ".orig directory name %s is not <package>-<upstreamversion> (wanted %s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:503
+#: scripts/dpkg-source.pl:512
 #, perl-format
 msgid ""
 ".orig.tar name %s is not <package>_<upstreamversion>.orig.tar (wanted %s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:516
+#: scripts/dpkg-source.pl:525
 #, perl-format
 msgid ""
 "tarfile `%s' already exists, not overwriting, giving up; use -sU or -sR to "
 "override"
 msgstr ""
 
-#: scripts/dpkg-source.pl:519
+#: scripts/dpkg-source.pl:528
 #, perl-format
 msgid "unable to check for existence of `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:522 scripts/dpkg-source.pl:592
-#: scripts/dpkg-source.pl:752
+#: scripts/dpkg-source.pl:531 scripts/dpkg-source.pl:601
+#: scripts/dpkg-source.pl:761
 #, perl-format
 msgid "%s: building %s in %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:524
+#: scripts/dpkg-source.pl:533
 msgid "write building tar message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:528
+#: scripts/dpkg-source.pl:537
 msgid "fork for tar"
 msgstr ""
 
-#: scripts/dpkg-source.pl:531
+#: scripts/dpkg-source.pl:540
 #, perl-format
 msgid "chdir to above (orig) source %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:532
+#: scripts/dpkg-source.pl:541
 msgid "reopen gzip for tar"
 msgstr ""
 
-#: scripts/dpkg-source.pl:534
+#: scripts/dpkg-source.pl:543
 msgid "exec tar"
 msgstr ""
 
-#: scripts/dpkg-source.pl:538
+#: scripts/dpkg-source.pl:547
 msgid "wait for tar"
 msgstr ""
 
-#: scripts/dpkg-source.pl:541 scripts/dpkg-source.pl:713
+#: scripts/dpkg-source.pl:550 scripts/dpkg-source.pl:722
 #, perl-format
 msgid "unable to rename `%s' (newly created) to `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:544 scripts/dpkg-source.pl:716
+#: scripts/dpkg-source.pl:553 scripts/dpkg-source.pl:725
 #, perl-format
 msgid "unable to change permission of `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:548
+#: scripts/dpkg-source.pl:557
 #, perl-format
 msgid "%s: building %s using existing %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:550
+#: scripts/dpkg-source.pl:559
 msgid "write using existing tar message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:560
+#: scripts/dpkg-source.pl:569
 #, perl-format
 msgid ""
 "orig dir `%s' already exists, not overwriting, giving up; use -sA, -sK or -"
 "sP to override"
 msgstr ""
 
-#: scripts/dpkg-source.pl:567
+#: scripts/dpkg-source.pl:576
 #, perl-format
 msgid "unable to check for existence of orig dir `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:577 scripts/dpkg-source.pl:938
+#: scripts/dpkg-source.pl:586 scripts/dpkg-source.pl:947
 #, perl-format
 msgid "unable to create `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:581 scripts/dpkg-source.pl:919
-#: scripts/dpkg-source.pl:942
+#: scripts/dpkg-source.pl:590 scripts/dpkg-source.pl:928
+#: scripts/dpkg-source.pl:951
 #, perl-format
 msgid "unable to rename `%s' to `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:585 scripts/dpkg-source.pl:944
+#: scripts/dpkg-source.pl:594 scripts/dpkg-source.pl:953
 #, perl-format
 msgid "unable to remove `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:594
+#: scripts/dpkg-source.pl:603
 msgid "write building diff message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:599
+#: scripts/dpkg-source.pl:608
 msgid "fork for find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:601
+#: scripts/dpkg-source.pl:610
 #, perl-format
 msgid "chdir to %s for find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:602
+#: scripts/dpkg-source.pl:611
 msgid "exec find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:611
+#: scripts/dpkg-source.pl:620
 #, perl-format
 msgid "cannot stat file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:618
+#: scripts/dpkg-source.pl:627
 #, perl-format
 msgid "cannot read link %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:620
+#: scripts/dpkg-source.pl:629
 #, perl-format
 msgid "cannot read orig link %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:621 scripts/dpkg-source.pl:622
+#: scripts/dpkg-source.pl:630 scripts/dpkg-source.pl:631
 #, perl-format
 msgid "symlink to %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:629 scripts/dpkg-source.pl:700
+#: scripts/dpkg-source.pl:638 scripts/dpkg-source.pl:709
 #, perl-format
 msgid "cannot stat orig file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:632
+#: scripts/dpkg-source.pl:641
 #, perl-format
 msgid "newly created empty file '%s' will not be represented in diff"
 msgstr ""
 
-#: scripts/dpkg-source.pl:636
+#: scripts/dpkg-source.pl:645
 #, perl-format
 msgid "executable mode %04o of '%s' will not be represented in diff"
 msgstr ""
 
-#: scripts/dpkg-source.pl:641
+#: scripts/dpkg-source.pl:650
 #, perl-format
 msgid "special mode %04o of '%s' will not be represented in diff"
 msgstr ""
 
-#: scripts/dpkg-source.pl:648 scripts/dpkg-source.pl:1523
+#: scripts/dpkg-source.pl:657 scripts/dpkg-source.pl:1532
 msgid "something else"
 msgstr ""
 
-#: scripts/dpkg-source.pl:649
+#: scripts/dpkg-source.pl:658
 msgid "plain file"
 msgstr ""
 
-#: scripts/dpkg-source.pl:652
+#: scripts/dpkg-source.pl:661
 msgid "fork for diff"
 msgstr ""
 
-#: scripts/dpkg-source.pl:661
+#: scripts/dpkg-source.pl:670
 msgid "exec diff"
 msgstr ""
 
-#: scripts/dpkg-source.pl:668
+#: scripts/dpkg-source.pl:677
 msgid "binary file contents changed"
 msgstr ""
 
-#: scripts/dpkg-source.pl:673
+#: scripts/dpkg-source.pl:682
 #, perl-format
 msgid "file %s has no final newline (either original or modified version)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:677
+#: scripts/dpkg-source.pl:686
 #, perl-format
 msgid "unknown line from diff -u on %s: `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:680
+#: scripts/dpkg-source.pl:689
 msgid "failed to write to compression pipe"
 msgstr ""
 
-#: scripts/dpkg-source.pl:686
+#: scripts/dpkg-source.pl:695
 msgid "diff gave 1 but no diff lines found"
 msgstr ""
 
-#: scripts/dpkg-source.pl:689
+#: scripts/dpkg-source.pl:698
 #, perl-format
 msgid "diff on %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:695
+#: scripts/dpkg-source.pl:704
 msgid "device or socket is not allowed"
 msgstr ""
 
-#: scripts/dpkg-source.pl:702
+#: scripts/dpkg-source.pl:711
 msgid "not a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:703
+#: scripts/dpkg-source.pl:712
 msgid "directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:706
+#: scripts/dpkg-source.pl:715
 #, perl-format
 msgid "unknown file type (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:710
+#: scripts/dpkg-source.pl:719
 msgid "finish write to compression pipe"
 msgstr ""
 
-#: scripts/dpkg-source.pl:718
+#: scripts/dpkg-source.pl:727
 msgid "fork for 2nd find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:720
+#: scripts/dpkg-source.pl:729
 #, perl-format
 msgid "chdir to %s for 2nd find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:721
+#: scripts/dpkg-source.pl:730
 msgid "exec 2nd find"
 msgstr ""
 
-#: scripts/dpkg-source.pl:730
+#: scripts/dpkg-source.pl:739
 #, perl-format
 msgid "cannot check orig file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:732
+#: scripts/dpkg-source.pl:741
 #, perl-format
 msgid "ignoring deletion of file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:734
+#: scripts/dpkg-source.pl:743
 #, perl-format
 msgid "ignoring deletion of directory %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:736
+#: scripts/dpkg-source.pl:745
 #, perl-format
 msgid "ignoring deletion of symlink %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:738
+#: scripts/dpkg-source.pl:747
 msgid "not a file, directory or link"
 msgstr ""
 
-#: scripts/dpkg-source.pl:739 scripts/dpkg-source.pl:1518
+#: scripts/dpkg-source.pl:748 scripts/dpkg-source.pl:1527
 msgid "nonexistent"
 msgstr ""
 
-#: scripts/dpkg-source.pl:754
+#: scripts/dpkg-source.pl:763
 msgid "write building message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:756
+#: scripts/dpkg-source.pl:765
 #, perl-format
 msgid "create %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:762
+#: scripts/dpkg-source.pl:771
 #, perl-format
 msgid "%s: unrepresentable changes to source"
 msgstr ""
 
-#: scripts/dpkg-source.pl:763
+#: scripts/dpkg-source.pl:772
 #, perl-format
 msgid "write error msg: %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:772
+#: scripts/dpkg-source.pl:781
 #, perl-format
 msgid "source handling style -s%s not allowed with -x"
 msgstr ""
 
-#: scripts/dpkg-source.pl:775
+#: scripts/dpkg-source.pl:784
 msgid "-x needs at least one argument, the .dsc"
 msgstr ""
 
-#: scripts/dpkg-source.pl:776
+#: scripts/dpkg-source.pl:785
 msgid "-x takes no more than two arguments"
 msgstr ""
 
-#: scripts/dpkg-source.pl:780
+#: scripts/dpkg-source.pl:789
 msgid "-x needs the .dsc file as first argument, not a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:788
+#: scripts/dpkg-source.pl:797
 #, perl-format
 msgid "unpack target exists: %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:792 scripts/dpkg-source.pl:823
+#: scripts/dpkg-source.pl:801 scripts/dpkg-source.pl:832
 #, perl-format
 msgid "cannot open .dsc file %s: %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:812
+#: scripts/dpkg-source.pl:821
 #, perl-format
 msgid "failed to verify signature on %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:816
+#: scripts/dpkg-source.pl:825
 #, perl-format
 msgid "could not verify signature on %s since gpg isn't installed"
 msgstr ""
 
-#: scripts/dpkg-source.pl:820
+#: scripts/dpkg-source.pl:829
 #, perl-format
 msgid "extracting unsigned source package (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:829
+#: scripts/dpkg-source.pl:838
 #, perl-format
 msgid "missing critical source control field %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:835
+#: scripts/dpkg-source.pl:844
 #, perl-format
 msgid "Unsupported format of .dsc file (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:867
+#: scripts/dpkg-source.pl:876
 #, perl-format
 msgid "Files field contains invalid filename `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:872
+#: scripts/dpkg-source.pl:881
 #, perl-format
 msgid "repeated file type - files `%s' and `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:886
+#: scripts/dpkg-source.pl:895
 #, perl-format
 msgid "unrecognised file type - `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:890
+#: scripts/dpkg-source.pl:899
 msgid "no tarfile in Files field"
 msgstr ""
 
-#: scripts/dpkg-source.pl:893
+#: scripts/dpkg-source.pl:902
 msgid "multiple tarfiles in native package"
 msgstr ""
 
-#: scripts/dpkg-source.pl:894
+#: scripts/dpkg-source.pl:903
 msgid "native package with .orig.tar"
 msgstr ""
 
-#: scripts/dpkg-source.pl:897
+#: scripts/dpkg-source.pl:906
 msgid "no upstream tarfile in Files field"
 msgstr ""
 
-#: scripts/dpkg-source.pl:900
+#: scripts/dpkg-source.pl:909
 #, perl-format
 msgid "multiple upstream tarballs in %s format dsc"
 msgstr ""
 
-#: scripts/dpkg-source.pl:902
+#: scripts/dpkg-source.pl:911
 #, perl-format
 msgid "debian.tar in %s format dsc"
 msgstr ""
 
-#: scripts/dpkg-source.pl:912
+#: scripts/dpkg-source.pl:921
 #, perl-format
 msgid "%s: extracting %s in %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:914
+#: scripts/dpkg-source.pl:923
 msgid "write extracting message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:939
+#: scripts/dpkg-source.pl:948
 #, perl-format
 msgid "%s: unpacking %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:952
+#: scripts/dpkg-source.pl:961
 #, perl-format
 msgid "failed to stat `%s' to see if need to copy"
 msgstr ""
 
-#: scripts/dpkg-source.pl:964
+#: scripts/dpkg-source.pl:973
 #, perl-format
 msgid "failed to check destination `%s' to see if need to copy"
 msgstr ""
 
-#: scripts/dpkg-source.pl:977
+#: scripts/dpkg-source.pl:986
 msgid "unable to keep orig directory (already exists)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1011 scripts/dpkg-source.pl:1071
+#: scripts/dpkg-source.pl:1020 scripts/dpkg-source.pl:1080
 #, perl-format
 msgid "cannot stat %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1013
+#: scripts/dpkg-source.pl:1022
 #, perl-format
 msgid "failed to create %s subdirectory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1016
+#: scripts/dpkg-source.pl:1025
 #, perl-format
 msgid "diff patches file in directory `%s', but %s isn't a directory !"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1026
+#: scripts/dpkg-source.pl:1035
 #, perl-format
 msgid "failed to rename newly-extracted %s to %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1032
+#: scripts/dpkg-source.pl:1041
 #, perl-format
 msgid "failed to rename saved %s to %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1037
+#: scripts/dpkg-source.pl:1046
 #, perl-format
 msgid "%s: applying %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1042 scripts/dpkg-source.pl:1353
+#: scripts/dpkg-source.pl:1051 scripts/dpkg-source.pl:1362
 #, perl-format
 msgid "can't open diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1045
+#: scripts/dpkg-source.pl:1054
 msgid "fork for patch"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1047
+#: scripts/dpkg-source.pl:1056
 msgid "reopen gzip for patch"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1048
+#: scripts/dpkg-source.pl:1057
 #, perl-format
 msgid "chdir to %s for patch"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1052
+#: scripts/dpkg-source.pl:1061
 msgid "exec patch"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1055
+#: scripts/dpkg-source.pl:1064
 msgid "wait for patch"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1065
+#: scripts/dpkg-source.pl:1074
 #, perl-format
 msgid "cannot change timestamp for %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1067
+#: scripts/dpkg-source.pl:1076
 #, perl-format
 msgid "remove patch backup file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1072
+#: scripts/dpkg-source.pl:1081
 #, perl-format
 msgid "%s does not exist"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1075
+#: scripts/dpkg-source.pl:1084
 #, perl-format
 msgid "cannot make %s executable"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1077
+#: scripts/dpkg-source.pl:1086
 #, perl-format
 msgid "%s is not a plain file"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1081
+#: scripts/dpkg-source.pl:1090
 msgid "cannot stat `.'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1089
+#: scripts/dpkg-source.pl:1098
 #, perl-format
 msgid "cannot stat extracted object `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1100
+#: scripts/dpkg-source.pl:1109
 #, perl-format
 msgid "unknown object `%s' after extract (mode 0%o)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1105
+#: scripts/dpkg-source.pl:1114
 #, perl-format
 msgid "cannot change mode of `%s' to 0%o from 0%o"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1116
+#: scripts/dpkg-source.pl:1125
 #, perl-format
 msgid "cannot read %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1117
+#: scripts/dpkg-source.pl:1126
 #, perl-format
 msgid "cannot fstat %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1118
+#: scripts/dpkg-source.pl:1127
 #, perl-format
 msgid "file %s has size %s instead of expected %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1122
+#: scripts/dpkg-source.pl:1131
 #, perl-format
 msgid "file %s has md5sum %s instead of expected %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1124
+#: scripts/dpkg-source.pl:1133
 msgid "reopen stdin from /dev/null"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1131
+#: scripts/dpkg-source.pl:1140
 #, perl-format
 msgid "cannot stat directory %s (before removal)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1137
+#: scripts/dpkg-source.pl:1146
 #, perl-format
 msgid "unable to check for removal of dir `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1139
+#: scripts/dpkg-source.pl:1148
 #, perl-format
 msgid "rm -rf failed to remove `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1151
+#: scripts/dpkg-source.pl:1160
 msgid "fork for cpio"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1155
+#: scripts/dpkg-source.pl:1164
 msgid "reopen gzip for cpio"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1157
+#: scripts/dpkg-source.pl:1166
 msgid "exec cpio"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1171
+#: scripts/dpkg-source.pl:1180
 #, perl-format
 msgid "tarfile `%s' contains object with newline in its name (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1179
+#: scripts/dpkg-source.pl:1188
 #, perl-format
 msgid ""
 "first output from cpio -0t (from `%s') contains newline - you probably have "
 "an out of date version of cpio.  GNU cpio 2.4.2-2 is known to work"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1188
+#: scripts/dpkg-source.pl:1197
 #, perl-format
 msgid ""
 "tarfile `%s' does not extract into a directory off the current directory (%s "
 "from %s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1197
+#: scripts/dpkg-source.pl:1206
 #, perl-format
 msgid "tarfile `%s' contains object (%s) not in expected directory (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1203 scripts/dpkg-source.pl:1303
+#: scripts/dpkg-source.pl:1212 scripts/dpkg-source.pl:1312
 #, perl-format
 msgid "tarfile `%s' contains object with /../ in its name (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1230
+#: scripts/dpkg-source.pl:1239
 msgid "fork for tar -t"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1234
+#: scripts/dpkg-source.pl:1243
 msgid "reopen gzip for tar -t"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1235
+#: scripts/dpkg-source.pl:1244
 msgid "exec tar -vvtf -"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1245
+#: scripts/dpkg-source.pl:1254
 #, perl-format
 msgid "tarfile `%s' contains unknown object listed by tar as `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1252
+#: scripts/dpkg-source.pl:1261
 #, perl-format
 msgid "tarfile `%s' contains object `%s' with unknown or forbidden type `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1262
+#: scripts/dpkg-source.pl:1271
 #, perl-format
 msgid "tarfile `%s' contains incomplete entry `%s'\n"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1286
+#: scripts/dpkg-source.pl:1295
 #, perl-format
 msgid "filename '%s' was truncated by cpio; unable to check full pathname"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1293
+#: scripts/dpkg-source.pl:1302
 #, perl-format
 msgid ""
 "tarfile `%s' contains unexpected object listed by tar as `%s'; expected `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1308
+#: scripts/dpkg-source.pl:1317
 #, perl-format
 msgid "tarfile `%s' contains file with name ending in .dpkg-orig"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1313
+#: scripts/dpkg-source.pl:1322
 #, perl-format
 msgid "tarfile `%s' contains setuid, setgid or sticky object `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1318
+#: scripts/dpkg-source.pl:1327
 #, perl-format
 msgid "tarfile `%s' contains object `debian' that isn't a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1327
+#: scripts/dpkg-source.pl:1336
 #, perl-format
 msgid ""
 "tarfile `%s' contains object `%s' but its containing directory `%s' does not "
 "precede it"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1365 scripts/dpkg-source.pl:1410
-#: scripts/dpkg-source.pl:1421
+#: scripts/dpkg-source.pl:1374 scripts/dpkg-source.pl:1419
+#: scripts/dpkg-source.pl:1430
 #, perl-format
 msgid "diff `%s' is missing trailing newline"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1367
+#: scripts/dpkg-source.pl:1376
 #, perl-format
 msgid "expected ^--- in line %d of diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1370
+#: scripts/dpkg-source.pl:1379
 #, perl-format
 msgid "diff `%s' patches file with no subdirectory"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1372
+#: scripts/dpkg-source.pl:1381
 #, perl-format
 msgid "diff `%s' patches file with name ending .dpkg-orig"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1377
+#: scripts/dpkg-source.pl:1386
 #, perl-format
 msgid "diff `%s' finishes in middle of ---/+++ (line %d)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1382 scripts/dpkg-source.pl:1389
+#: scripts/dpkg-source.pl:1391 scripts/dpkg-source.pl:1398
 #, perl-format
 msgid "line after --- isn't as expected in diff `%s' (line %d)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1398
+#: scripts/dpkg-source.pl:1407
 #, perl-format
 msgid "diff `%s' patches something which is not a plain file"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1403
+#: scripts/dpkg-source.pl:1412
 #, perl-format
 msgid "diff patches file %s twice"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1413
+#: scripts/dpkg-source.pl:1422
 #, perl-format
 msgid "Expected ^@@ in line %d of diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1419
+#: scripts/dpkg-source.pl:1428
 #, perl-format
 msgid "unexpected end of diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1427
+#: scripts/dpkg-source.pl:1436
 #, perl-format
 msgid "expected [ +-] at start of line %d of diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1432
+#: scripts/dpkg-source.pl:1441
 #, perl-format
 msgid "expected ^@@ at line %d of diff `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1443
+#: scripts/dpkg-source.pl:1452
 msgid "fork for tar -xkf -"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1445
+#: scripts/dpkg-source.pl:1454
 msgid "reopen gzip for tar -xkf -"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1448
+#: scripts/dpkg-source.pl:1457
 #, perl-format
 msgid "cannot chdir to `%s' for tar extract"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1450
+#: scripts/dpkg-source.pl:1459
 msgid "exec tar -xkf -"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1453
+#: scripts/dpkg-source.pl:1462
 msgid "wait for tar -xkf -"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1485
+#: scripts/dpkg-source.pl:1494
 #, perl-format
 msgid "Unable to open dir %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1487
+#: scripts/dpkg-source.pl:1496
 #, perl-format
 msgid "Unable to close dir %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1490 scripts/dpkg-source.pl:1498
-#: scripts/dpkg-source.pl:1503
+#: scripts/dpkg-source.pl:1499 scripts/dpkg-source.pl:1507
+#: scripts/dpkg-source.pl:1512
 #, perl-format
 msgid "Unable to rename %s to %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1495
+#: scripts/dpkg-source.pl:1504
 #, perl-format
 msgid "Unable to mkdir %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1511
+#: scripts/dpkg-source.pl:1520
 msgid "reopen stderr for tar to grep out blocks message"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1521
+#: scripts/dpkg-source.pl:1530
 #, perl-format
 msgid "checktype %s (%s)"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1529
+#: scripts/dpkg-source.pl:1538
 msgid "only one of -x or -b allowed, and only once"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1534
+#: scripts/dpkg-source.pl:1543
 #, perl-format
 msgid "%s: cannot represent change to %s: %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1536 scripts/dpkg-source.pl:1545
+#: scripts/dpkg-source.pl:1545 scripts/dpkg-source.pl:1554
 msgid "write syserr unrep"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1541
+#: scripts/dpkg-source.pl:1550
 #, perl-format
 msgid ""
 "%s: cannot represent change to %s:\n"
@@ -2325,80 +2325,80 @@ msgid ""
 "%s:  old version is %s\n"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1563 scripts/dpkg-source.pl:1594
+#: scripts/dpkg-source.pl:1572 scripts/dpkg-source.pl:1603
 #, perl-format
 msgid "unknown compression type on file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1570
+#: scripts/dpkg-source.pl:1579
 #, perl-format
 msgid "create file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1571
+#: scripts/dpkg-source.pl:1580
 msgid "pipe for gzip"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1572
+#: scripts/dpkg-source.pl:1581
 msgid "fork for gzip"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1574
+#: scripts/dpkg-source.pl:1583
 msgid "reopen gzip pipe"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1576
+#: scripts/dpkg-source.pl:1585
 msgid "reopen tar"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1577
+#: scripts/dpkg-source.pl:1586
 msgid "exec gzip"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1597
+#: scripts/dpkg-source.pl:1606
 #, perl-format
 msgid "read file %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1598
+#: scripts/dpkg-source.pl:1607
 #, perl-format
 msgid "pipe for %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1599
+#: scripts/dpkg-source.pl:1608
 #, perl-format
 msgid "fork for %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1601
+#: scripts/dpkg-source.pl:1610
 #, perl-format
 msgid "reopen %s pipe"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1603
+#: scripts/dpkg-source.pl:1612
 msgid "reopen input file"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1604
+#: scripts/dpkg-source.pl:1613
 #, perl-format
 msgid "exec %s"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1611
+#: scripts/dpkg-source.pl:1620
 msgid "wait for gzip"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1621
+#: scripts/dpkg-source.pl:1630
 #, perl-format
 msgid "tried to add file `%s' twice"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1622
+#: scripts/dpkg-source.pl:1631
 #, perl-format
 msgid "could not stat output file `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:1643
+#: scripts/dpkg-source.pl:1652
 #, perl-format
 msgid "bogus character `\\%s' in `%s'"
 msgstr ""
@@ -2548,27 +2548,27 @@ msgstr ""
 msgid "Couldn't parse dynamic symbol definition: %s"
 msgstr ""
 
-#: scripts/Dpkg/Shlibs/SymbolFile.pm:101
+#: scripts/Dpkg/Shlibs/SymbolFile.pm:103
 #, perl-format
 msgid "Can't open %s: %s"
 msgstr ""
 
-#: scripts/Dpkg/Shlibs/SymbolFile.pm:107
+#: scripts/Dpkg/Shlibs/SymbolFile.pm:109
 #, perl-format
 msgid "Symbol information must be preceded by a header (file %s, line %s)."
 msgstr ""
 
-#: scripts/Dpkg/Shlibs/SymbolFile.pm:147
+#: scripts/Dpkg/Shlibs/SymbolFile.pm:149
 #, perl-format
 msgid "Failed to parse a line in %s: %s"
 msgstr ""
 
-#: scripts/Dpkg/Shlibs/SymbolFile.pm:161
+#: scripts/Dpkg/Shlibs/SymbolFile.pm:163
 #, perl-format
 msgid "Can't open %s for writing: %s"
 msgstr ""
 
-#: scripts/Dpkg/Shlibs/SymbolFile.pm:194
+#: scripts/Dpkg/Shlibs/SymbolFile.pm:196
 msgid "Can't merge symbols from objects without SONAME."
 msgstr ""
 
diff --git a/scripts/po/fr.po b/scripts/po/fr.po
index 1272832d..995f79f6 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-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\n"
 "PO-Revision-Date: 2007-12-05 23:20+0100\n"
 "Last-Translator: Frédéric Bothamy <frederic.bothamy@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -120,8 +120,8 @@ msgstr "impossible d'ouvrir le fichier substvars %s
 msgid "fork for parse changelog"
 msgstr "fork pour analyse du changelog"
 
-#: scripts/controllib.pl:191 scripts/dpkg-genchanges.pl:305
-#: scripts/dpkg-gencontrol.pl:220 scripts/dpkg-source.pl:380
+#: scripts/controllib.pl:191 scripts/dpkg-genchanges.pl:306
+#: scripts/dpkg-gencontrol.pl:220 scripts/dpkg-source.pl:381
 msgid "parsed version of changelog"
 msgstr "version analysée du changelog"
 
@@ -132,15 +132,13 @@ msgstr "analyse du changelog"
 #: scripts/controllib.pl:232
 #, 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é"
+msgstr "le nom du paquet source « %s » contient un caractère « %s » non autorisé"
 
 #: scripts/controllib.pl:235
 #, 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"
+"le nom du paquet source « %s » ne commence ni par une lettre ni par un chiffre"
 
 #: scripts/controllib.pl:241
 #, perl-format
@@ -196,11 +194,11 @@ msgid "syntax error in %s at line %d: %s"
 msgstr "erreur de syntaxe dans %s à la ligne %d : %s"
 
 #: scripts/dpkg-architecture.pl:35 scripts/dpkg-buildpackage.pl:21
-#: scripts/dpkg-distaddfile.pl:21 scripts/dpkg-genchanges.pl:82
+#: scripts/dpkg-distaddfile.pl:21 scripts/dpkg-genchanges.pl:83
 #: scripts/dpkg-gencontrol.pl:50 scripts/dpkg-gensymbols.pl:36
 #: scripts/dpkg-parsechangelog.pl:24 scripts/dpkg-scanpackages.pl:51
-#: scripts/dpkg-scansources.pl:96 scripts/dpkg-shlibdeps.pl:357
-#: scripts/dpkg-source.pl:138 scripts/changelog/debian.pl:31
+#: scripts/dpkg-scansources.pl:96 scripts/dpkg-shlibdeps.pl:359
+#: scripts/dpkg-source.pl:139 scripts/changelog/debian.pl:31
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s version %s.\n"
@@ -216,10 +214,10 @@ msgstr ""
 "Copyright (C) 2004-2005 Scott James Remnant <scott@netsplit.com>."
 
 #: scripts/dpkg-architecture.pl:41 scripts/dpkg-buildpackage.pl:28
-#: scripts/dpkg-distaddfile.pl:26 scripts/dpkg-genchanges.pl:88
+#: scripts/dpkg-distaddfile.pl:26 scripts/dpkg-genchanges.pl:89
 #: scripts/dpkg-gencontrol.pl:56 scripts/dpkg-gensymbols.pl:42
-#: scripts/dpkg-parsechangelog.pl:30 scripts/dpkg-shlibdeps.pl:366
-#: scripts/dpkg-source.pl:143 scripts/changelog/debian.pl:35
+#: scripts/dpkg-parsechangelog.pl:30 scripts/dpkg-shlibdeps.pl:368
+#: scripts/dpkg-source.pl:144 scripts/changelog/debian.pl:35
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -278,9 +276,9 @@ msgstr ""
 "  --version          afficher la version.\n"
 
 #: scripts/dpkg-architecture.pl:120 scripts/dpkg-distaddfile.pl:54
-#: scripts/dpkg-genchanges.pl:177 scripts/dpkg-gencontrol.pl:129
+#: scripts/dpkg-genchanges.pl:178 scripts/dpkg-gencontrol.pl:129
 #: scripts/dpkg-gensymbols.pl:108 scripts/dpkg-shlibdeps.pl:82
-#: scripts/dpkg-source.pl:268 scripts/changelog/debian.pl:64
+#: scripts/dpkg-source.pl:269 scripts/changelog/debian.pl:64
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "option inconnue « %s »"
@@ -591,7 +589,7 @@ msgid "%s: Build conflicts: "
 msgstr "%s : conflits de construction du paquet : "
 
 #: scripts/dpkg-checkbuilddeps.pl:157 scripts/dpkg-gencontrol.pl:261
-#: scripts/dpkg-gencontrol.pl:268 scripts/dpkg-source.pl:319
+#: scripts/dpkg-gencontrol.pl:268 scripts/dpkg-source.pl:320
 #, perl-format
 msgid "error occurred while parsing %s"
 msgstr "erreur rencontrée lors de l'analyse de %s"
@@ -654,7 +652,7 @@ msgstr "
 msgid "close new files list file"
 msgstr "fermeture du nouveau fichier des fichiers"
 
-#: scripts/dpkg-genchanges.pl:84
+#: scripts/dpkg-genchanges.pl:85
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson.\n"
@@ -664,7 +662,7 @@ msgstr ""
 "Copyright (C) 1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 
-#: scripts/dpkg-genchanges.pl:96
+#: scripts/dpkg-genchanges.pl:97
 #, fuzzy, perl-format
 msgid ""
 "Usage: %s [<option> ...]\n"
@@ -733,180 +731,179 @@ msgstr ""
 "  -h, --help                 afficher ce message d'aide.\n"
 "      --version              afficher la version.\n"
 
-#: scripts/dpkg-genchanges.pl:129 scripts/dpkg-genchanges.pl:132
-#: scripts/dpkg-genchanges.pl:136 scripts/dpkg-genchanges.pl:140
+#: scripts/dpkg-genchanges.pl:130 scripts/dpkg-genchanges.pl:133
+#: scripts/dpkg-genchanges.pl:137 scripts/dpkg-genchanges.pl:141
 #, fuzzy, perl-format
 msgid "cannot combine %s and -S"
 msgstr "impossible de combiner %s et %s"
 
-#: scripts/dpkg-genchanges.pl:134
+#: scripts/dpkg-genchanges.pl:135
 #, perl-format
 msgid "%s: arch-specific upload - not including arch-independent packages"
 msgstr ""
 "%s : envoi d'un paquet pour une architecture - n'inclut pas de paquet "
 "indépendant d'une architecture."
 
-#: scripts/dpkg-genchanges.pl:138
+#: scripts/dpkg-genchanges.pl:139
 #, fuzzy, perl-format
 msgid "%s: arch-indep upload - not including arch-specific packages"
 msgstr ""
 "%s : envoi d'un paquet pour une architecture - n'inclut pas de paquet "
 "indépendant d'une architecture."
 
-#: scripts/dpkg-genchanges.pl:185
+#: scripts/dpkg-genchanges.pl:186
 msgid "cannot read files list file"
 msgstr "impossible de lire le fichier des fichiers."
 
-#: scripts/dpkg-genchanges.pl:189
+#: scripts/dpkg-genchanges.pl:190
 #, perl-format
 msgid "duplicate files list entry for package %s (line %d)"
 msgstr ""
 "entrée en double dans le fichier des fichiers pour le paquet %s (ligne %d) "
 
-#: scripts/dpkg-genchanges.pl:197 scripts/dpkg-genchanges.pl:211
+#: scripts/dpkg-genchanges.pl:198 scripts/dpkg-genchanges.pl:212
 #, perl-format
 msgid "duplicate files list entry for file %s (line %d)"
 msgstr ""
 "entrée en double dans le fichier des fichiers pour le fichier %s (ligne %d)"
 
-#: scripts/dpkg-genchanges.pl:217
+#: scripts/dpkg-genchanges.pl:218
 #, perl-format
 msgid "badly formed line in files list file, line %d"
 msgstr "ligne %d mal formée dans le fichier des fichiers"
 
-#: scripts/dpkg-genchanges.pl:238 scripts/dpkg-gencontrol.pl:174
-#: scripts/dpkg-source.pl:327
+#: scripts/dpkg-genchanges.pl:239 scripts/dpkg-gencontrol.pl:174
+#: scripts/dpkg-source.pl:328
 msgid "general section of control info file"
 msgstr "section générale dans le fichier info"
 
-#: scripts/dpkg-genchanges.pl:249
+#: scripts/dpkg-genchanges.pl:250
 #, 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:292 scripts/dpkg-gencontrol.pl:205
-#: scripts/dpkg-source.pl:367
+#: scripts/dpkg-genchanges.pl:293 scripts/dpkg-gencontrol.pl:205
+#: scripts/dpkg-source.pl:368
 msgid "package's section of control info file"
 msgstr "section du paquet dans le fichier info"
 
-#: scripts/dpkg-genchanges.pl:316
+#: scripts/dpkg-genchanges.pl:317
 msgid "read changesdescription"
 msgstr "lecture de changesdescription"
 
-#: scripts/dpkg-genchanges.pl:327
+#: scripts/dpkg-genchanges.pl:328
 #, 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:339
+#: scripts/dpkg-genchanges.pl:340
 #, perl-format
 msgid "missing Section for binary package %s; using '-'"
 msgstr "la section du paquet binaire %s manque ; utilisation de « - »"
 
-#: scripts/dpkg-genchanges.pl:341
+#: scripts/dpkg-genchanges.pl:342
 #, 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:348
+#: scripts/dpkg-genchanges.pl:349
 #, perl-format
 msgid "missing Priority for binary package %s; using '-'"
-msgstr ""
-"le champ « Priority » du paquet binaire %s manque ; utilisation de « - »"
+msgstr "le champ « Priority » du paquet binaire %s manque ; utilisation de « - »"
 
-#: scripts/dpkg-genchanges.pl:350
+#: scripts/dpkg-genchanges.pl:351
 #, 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:365
+#: scripts/dpkg-genchanges.pl:366
 msgid "missing Section for source files"
 msgstr "il manque la section pour les fichiers source"
 
-#: scripts/dpkg-genchanges.pl:370
+#: scripts/dpkg-genchanges.pl:371
 msgid "missing Priority for source files"
 msgstr "il manque la priorité pour les fichiers source"
 
-#: scripts/dpkg-genchanges.pl:375
+#: scripts/dpkg-genchanges.pl:376
 #, fuzzy, perl-format
 msgid "cannot open .dsc file %s"
 msgstr "impossible d'ouvrir le fichier .dsc %s : %s"
 
-#: scripts/dpkg-genchanges.pl:378 scripts/dpkg-source.pl:824
+#: scripts/dpkg-genchanges.pl:379 scripts/dpkg-source.pl:833
 #, perl-format
 msgid "source control file %s"
 msgstr "fichier de contrôle des sources %s"
 
-#: scripts/dpkg-genchanges.pl:384 scripts/dpkg-source.pl:863
+#: scripts/dpkg-genchanges.pl:385 scripts/dpkg-source.pl:872
 #, perl-format
 msgid "Files field contains bad line `%s'"
 msgstr "le champ Files contient une ligne mal formée « %s »"
 
-#: scripts/dpkg-genchanges.pl:396
+#: scripts/dpkg-genchanges.pl:397
 msgid "not including original source code in upload"
 msgstr "pas d'inclusion du code source original dans l'envoi (« upload »)"
 
-#: scripts/dpkg-genchanges.pl:401
+#: scripts/dpkg-genchanges.pl:402
 msgid "ignoring -sd option for native Debian package"
 msgstr "option -sd ignorée pour les paquets Debian pure souche"
 
-#: scripts/dpkg-genchanges.pl:403
+#: scripts/dpkg-genchanges.pl:404
 msgid "including full source code in upload"
 msgstr "inclusion du code source original dans l'envoi (« upload »)"
 
-#: scripts/dpkg-genchanges.pl:406
+#: scripts/dpkg-genchanges.pl:407
 msgid "binary-only upload - not including any source code"
 msgstr "envoi d'un binaire - aucune inclusion de code source"
 
-#: scripts/dpkg-genchanges.pl:410
+#: scripts/dpkg-genchanges.pl:411
 msgid "write original source message"
 msgstr "écriture du message source original"
 
-#: scripts/dpkg-genchanges.pl:440
+#: scripts/dpkg-genchanges.pl:441
 #, perl-format
 msgid "cannot open upload file %s for reading"
 msgstr "impossible de lire le fichier d'envoi %s"
 
-#: scripts/dpkg-genchanges.pl:441
+#: scripts/dpkg-genchanges.pl:442
 #, perl-format
 msgid "cannot fstat upload file %s"
 msgstr "impossible de lancer « fstat » sur le fichier d'envoi %s"
 
-#: scripts/dpkg-genchanges.pl:443
+#: scripts/dpkg-genchanges.pl:444
 #, perl-format
 msgid "upload file %s is empty"
 msgstr "le fichier d'envoi %s est vide"
 
-#: scripts/dpkg-genchanges.pl:445
+#: scripts/dpkg-genchanges.pl:446
 #, perl-format
 msgid "md5sum upload file %s"
 msgstr "exécution de md5sum sur le fichier d'envoi %s"
 
-#: scripts/dpkg-genchanges.pl:447
+#: scripts/dpkg-genchanges.pl:448
 #, 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:451
+#: scripts/dpkg-genchanges.pl:452
 #, 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:466 scripts/dpkg-source.pl:396
+#: scripts/dpkg-genchanges.pl:467 scripts/dpkg-source.pl:397
 #, 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:471 scripts/dpkg-gencontrol.pl:278
-#: scripts/dpkg-gencontrol.pl:281 scripts/dpkg-source.pl:400
+#: scripts/dpkg-genchanges.pl:472 scripts/dpkg-gencontrol.pl:278
+#: scripts/dpkg-gencontrol.pl:281 scripts/dpkg-source.pl:401
 #, perl-format
 msgid "missing information for output field %s"
 msgstr "il manque l'information pour le champ de sortie %s"
@@ -1002,7 +999,7 @@ msgstr ""
 "l'actuelle architecture hôte « %s » n'apparaît pas dans la liste "
 "d'architecture du paquet (%s)"
 
-#: scripts/dpkg-gencontrol.pl:224 scripts/dpkg-source.pl:384
+#: scripts/dpkg-gencontrol.pl:224 scripts/dpkg-source.pl:385
 #, perl-format
 msgid "value from nowhere, with key >%s< and value >%s<"
 msgstr "valeur de nulle part, avec clé >%s< et valeur >%s<"
@@ -1558,7 +1555,7 @@ msgstr "champ de d
 msgid "need at least one executable"
 msgstr "au moins un exécutable est nécessaire"
 
-#: scripts/dpkg-shlibdeps.pl:115
+#: scripts/dpkg-shlibdeps.pl:116
 #, perl-format
 msgid ""
 "couldn't find library %s needed by %s (its RPATH is '%s').\n"
@@ -1574,50 +1571,50 @@ msgstr ""
 "Pour aider dpkg-shlibdeps à trouver des bibliothèques privées, vous pouvez "
 "avoir à définir LD_LIBRARY_PATH."
 
-#: scripts/dpkg-shlibdeps.pl:198
+#: scripts/dpkg-shlibdeps.pl:200
 #, perl-format
 msgid "no dependency information found for %s (used by %s)."
 msgstr "pas d'informations de dépendance trouvées pour %s (utilisé par %s)."
 
-#: scripts/dpkg-shlibdeps.pl:238
+#: scripts/dpkg-shlibdeps.pl:240
 #, perl-format
 msgid "symbol %s used by %s found in none of the libraries."
 msgstr "symbole %s utilisé par %s trouvé dans aucun des bibliothèques."
 
-#: scripts/dpkg-shlibdeps.pl:251
+#: scripts/dpkg-shlibdeps.pl:253
 #, perl-format
 msgid "%d other similar warnings have been skipped (use -v to see them all)."
 msgstr ""
 "%d autres avertissements semblables ont été sautés (utiliser -v pour les "
 "voir tous)."
 
-#: scripts/dpkg-shlibdeps.pl:271
+#: scripts/dpkg-shlibdeps.pl:273
 #, perl-format
 msgid "%s shouldn't be linked with %s (it uses none of its symbols)."
 msgstr ""
 "%s ne devrait pas être lié avec %s (il n'utilise aucun de ses symboles)."
 
-#: scripts/dpkg-shlibdeps.pl:283
+#: scripts/dpkg-shlibdeps.pl:285
 #, perl-format
 msgid "open new substvars file `%s'"
 msgstr "ouverture du nouveau fichier substvars %s"
 
-#: scripts/dpkg-shlibdeps.pl:286
+#: scripts/dpkg-shlibdeps.pl:288
 #, perl-format
 msgid "open old varlist file `%s' for reading"
 msgstr "lecture de l'ancien fichier varlist %s"
 
-#: scripts/dpkg-shlibdeps.pl:289
+#: scripts/dpkg-shlibdeps.pl:291
 #, perl-format
 msgid "copy old entry to new varlist file `%s'"
 msgstr "copie d'une ancienne entrée dans le nouveau fichier varlist %s"
 
-#: scripts/dpkg-shlibdeps.pl:349
+#: scripts/dpkg-shlibdeps.pl:351
 #, perl-format
 msgid "install new varlist file `%s'"
 msgstr "installation du nouveau fichier varlist %s"
 
-#: scripts/dpkg-shlibdeps.pl:359
+#: scripts/dpkg-shlibdeps.pl:361
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson.\n"
@@ -1631,7 +1628,7 @@ msgstr ""
 "Copyright (C) 2006 Frank Lichtenheld.\n"
 "Copyright (C) 2007 Raphael Hertzog.\n"
 
-#: scripts/dpkg-shlibdeps.pl:374
+#: scripts/dpkg-shlibdeps.pl:376
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <executable>|-e<executable> [<option> ...]\n"
@@ -1680,30 +1677,30 @@ msgstr ""
 "Champs de dépendance reconnus :\n"
 "  %s\n"
 
-#: scripts/dpkg-shlibdeps.pl:481
+#: scripts/dpkg-shlibdeps.pl:485
 #, perl-format
 msgid "Can't extract name and version from library name `%s'"
 msgstr ""
 "Impossible d'extraire le nom et la version du nom de la bibliothèque « %s »"
 
-#: scripts/dpkg-shlibdeps.pl:488
+#: scripts/dpkg-shlibdeps.pl:492
 #, perl-format
 msgid "unable to open shared libs info file `%s'"
 msgstr "impossible d'ouvrir le fichier sur les bibliothèques partagées %s"
 
-#: scripts/dpkg-shlibdeps.pl:494
+#: scripts/dpkg-shlibdeps.pl:498
 #, perl-format
 msgid "shared libs info file `%s' line %d: bad line `%s'"
 msgstr ""
 "fichier info sur les bibliothèques partagées « %s », ligne %d : ligne mal "
 "formée « %s »"
 
-#: scripts/dpkg-shlibdeps.pl:535
+#: scripts/dpkg-shlibdeps.pl:539
 #, perl-format
 msgid "cannot open file %s"
 msgstr "impossible d'ouvrir le fichier %s"
 
-#: scripts/dpkg-shlibdeps.pl:568
+#: scripts/dpkg-shlibdeps.pl:572
 #, perl-format
 msgid ""
 "$ORIGIN is used in RPATH of %s and the corresponding directory could not be "
@@ -1714,28 +1711,28 @@ msgstr ""
 "pas pu être identifié en raison de l'absence de sous-répertoire DEBIAN dans "
 "la racine de l'arborescence de construction du paquet"
 
-#: scripts/dpkg-shlibdeps.pl:615
+#: scripts/dpkg-shlibdeps.pl:619
 msgid "cannot fork for dpkg --search"
 msgstr "fork impossible pour dpkg --search"
 
-#: scripts/dpkg-shlibdeps.pl:622
+#: scripts/dpkg-shlibdeps.pl:626
 msgid "cannot exec dpkg"
 msgstr "impossible d'exécuter dpkg"
 
-#: scripts/dpkg-shlibdeps.pl:627
+#: scripts/dpkg-shlibdeps.pl:631
 msgid "diversions involved - output may be incorrect"
 msgstr "détournements en jeu, la sortie peut être incorrecte"
 
-#: scripts/dpkg-shlibdeps.pl:629
+#: scripts/dpkg-shlibdeps.pl:633
 msgid "write diversion info to stderr"
 msgstr "info sur le détournement envoyée sur stderr"
 
-#: scripts/dpkg-shlibdeps.pl:633
+#: scripts/dpkg-shlibdeps.pl:637
 #, perl-format
 msgid "unknown output from dpkg --search: '%s'"
 msgstr "résultat de dpkg --search inconnu : %s"
 
-#: scripts/dpkg-source.pl:140
+#: scripts/dpkg-source.pl:141
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson and Klee Dienes."
@@ -1743,7 +1740,7 @@ msgstr ""
 "\n"
 "Copyright (C) 1996 Ian Jackson and Klee Dienes."
 
-#: scripts/dpkg-source.pl:151
+#: scripts/dpkg-source.pl:152
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -1840,8 +1837,8 @@ msgstr ""
 "                             les valeurs gérées sont : %s).\n"
 "  -z<niveau>                 niveau de compression à utiliser (par défaut, "
 "« 9 »,\n"
-"                             les valeurs gérées sont : « 1 » - « 9 », "
-"« best », « fast »)\n"
+"                             les valeurs gérées sont : « 1 » - « 9 », « best », "
+"« fast »)\n"
 "\n"
 "Options d'extraction :\n"
 "  -sp (défaut)               garder les sources empaquetées dans le rep "
@@ -1853,69 +1850,79 @@ msgstr ""
 "  -h, --help                 afficher ce message d'aide.\n"
 "      --version              afficher la version.\n"
 
-#: scripts/dpkg-source.pl:220
+#: scripts/dpkg-source.pl:221
 #, perl-format
 msgid "%s is not a supported compression"
 msgstr "%s n'est pas une compression gérée"
 
-#: scripts/dpkg-source.pl:224
+#: scripts/dpkg-source.pl:225
 #, perl-format
 msgid "%s is not a compression level"
 msgstr "%s n'est pas un niveau de compression"
 
-#: scripts/dpkg-source.pl:227
+#: scripts/dpkg-source.pl:228
 #, perl-format
 msgid "-s%s option overrides earlier -s%s option"
 msgstr "l'option -s%s annule une précédente option -s%s"
 
-#: scripts/dpkg-source.pl:272
+#: scripts/dpkg-source.pl:273
 msgid "need -x or -b"
 msgstr "-x ou -b nécessaire"
 
-#: scripts/dpkg-source.pl:280
+#: scripts/dpkg-source.pl:281
 #, perl-format
 msgid "source handling style -s%s not allowed with -b"
 msgstr "gestion des sources avec -s%s non autorisée avec -b"
 
-#: scripts/dpkg-source.pl:283
+#: scripts/dpkg-source.pl:284
 msgid "-b needs a directory"
 msgstr "répertoire nécessaire avec -b"
 
-#: scripts/dpkg-source.pl:284
+#: scripts/dpkg-source.pl:285
 msgid "-b takes at most a directory and an orig source argument"
 msgstr "il faut au plus un paramètre répertoire et un paramètre source avec -b"
 
-#: scripts/dpkg-source.pl:287
+#: scripts/dpkg-source.pl:288
 #, perl-format
 msgid "cannot stat directory %s: %s"
 msgstr "« stat » du répertoire %s impossible : %s"
 
-#: scripts/dpkg-source.pl:288
+#: scripts/dpkg-source.pl:289
 #, perl-format
 msgid "directory argument %s is not a directory"
 msgstr "paramètre répertoire %s n'est pas un répertoire"
 
-#: scripts/dpkg-source.pl:346
+#: scripts/dpkg-source.pl:347
 #, perl-format
 msgid "`%s' is not a legal architecture string"
 msgstr "%s n'est pas une architecture autorisée"
 
-#: scripts/dpkg-source.pl:349
+#: scripts/dpkg-source.pl:350
 #, perl-format
 msgid "architecture %s only allowed on its own (list for package %s is `%s')"
 msgstr ""
 "architecture %s seulement autorisée toute seule (liste pour paquet %s est %s)"
 
-#: scripts/dpkg-source.pl:402
+#: scripts/dpkg-source.pl:403
 msgid "unable to determine source package name !"
 msgstr "impossible de déterminer le nom du paquet source !"
 
-#: scripts/dpkg-source.pl:423
+#: scripts/dpkg-source.pl:424
+#, perl-format
+msgid "packed orig `%s' exists but is not a plain file"
+msgstr "l'orig compressé %s existe mais ce n'est pas un simple fichier"
+
+#: scripts/dpkg-source.pl:429
+#, perl-format
+msgid "unable to stat putative packed orig `%s'"
+msgstr "stat impossible du supposé orig compressé %s"
+
+#: scripts/dpkg-source.pl:439
 #, perl-format
 msgid "cannot stat orig argument %s: %s"
 msgstr "« stat » du paramètre source %s impossible : %s"
 
-#: scripts/dpkg-source.pl:429
+#: scripts/dpkg-source.pl:445
 #, perl-format
 msgid ""
 "orig argument is unpacked but source handling style -s%s calls for packed (."
@@ -1924,7 +1931,7 @@ msgstr ""
 "le paramètre source n'est pas compressé mais l'option -s%s demande des "
 "sources compressées (.orig.tar.<ext>)"
 
-#: scripts/dpkg-source.pl:436
+#: scripts/dpkg-source.pl:452
 #, perl-format
 msgid ""
 "orig argument is packed but source handling style -s%s calls for unpacked (."
@@ -1933,7 +1940,7 @@ msgstr ""
 "le paramètre source est compressé mais l'option -s%s demande des sources non "
 "compressées (.orig/)"
 
-#: scripts/dpkg-source.pl:445
+#: scripts/dpkg-source.pl:461
 #, perl-format
 msgid ""
 "orig argument is empty (means no orig, no diff) but source handling style -s%"
@@ -1942,43 +1949,33 @@ msgstr ""
 "le paramètre source est vide (pas d'orig, pas de diff) mais l'option -s%s "
 "veut quelque chose."
 
-#: scripts/dpkg-source.pl:453
-#, perl-format
-msgid "packed orig `%s' exists but is not a plain file"
-msgstr "l'orig compressé %s existe mais ce n'est pas un simple fichier"
-
-#: scripts/dpkg-source.pl:459
-#, perl-format
-msgid "unable to stat putative packed orig `%s'"
-msgstr "stat impossible du supposé orig compressé %s"
-
-#: scripts/dpkg-source.pl:464
+#: scripts/dpkg-source.pl:473
 #, perl-format
 msgid "unpacked orig `%s' exists but is not a directory"
 msgstr "orig non compressé %s existe mais ce n'est pas un répertoire"
 
-#: scripts/dpkg-source.pl:468
+#: scripts/dpkg-source.pl:477
 #, perl-format
 msgid "unable to stat putative unpacked orig `%s'"
 msgstr "stat impossible du supposé orig non compressé %s"
 
-#: scripts/dpkg-source.pl:480
+#: scripts/dpkg-source.pl:489
 #, perl-format
 msgid "source directory '%s' is not <sourcepackage>-<upstreamversion> '%s'"
 msgstr "répertoire source %s n'est pas <paquet_source>-<version_amont> %s"
 
-#: scripts/dpkg-source.pl:494
+#: scripts/dpkg-source.pl:503
 #, perl-format
 msgid ".orig directory name %s is not <package>-<upstreamversion> (wanted %s)"
 msgstr "répertoire .orig %s n'est pas <paquet>-<version_amont> (%s demandé)"
 
-#: scripts/dpkg-source.pl:503
+#: scripts/dpkg-source.pl:512
 #, perl-format
 msgid ""
 ".orig.tar name %s is not <package>_<upstreamversion>.orig.tar (wanted %s)"
 msgstr ".orig.tar %s n'est pas <paquet>_<version_amont>.orig.tar (%s demandé)"
 
-#: scripts/dpkg-source.pl:516
+#: scripts/dpkg-source.pl:525
 #, perl-format
 msgid ""
 "tarfile `%s' already exists, not overwriting, giving up; use -sU or -sR to "
@@ -1987,62 +1984,62 @@ msgstr ""
 "le fichier tar %s existe déjà, pas de modification, abandon ; utiliser -sU "
 "ou -sR pour forcer."
 
-#: scripts/dpkg-source.pl:519
+#: scripts/dpkg-source.pl:528
 #, perl-format
 msgid "unable to check for existence of `%s'"
 msgstr "impossible de vérifier l'existence de %s"
 
-#: scripts/dpkg-source.pl:522 scripts/dpkg-source.pl:592
-#: scripts/dpkg-source.pl:752
+#: scripts/dpkg-source.pl:531 scripts/dpkg-source.pl:601
+#: scripts/dpkg-source.pl:761
 #, perl-format
 msgid "%s: building %s in %s"
 msgstr "%s : construction de %s dans %s"
 
-#: scripts/dpkg-source.pl:524
+#: scripts/dpkg-source.pl:533
 msgid "write building tar message"
 msgstr "écriture du message concernant la construction du tar"
 
-#: scripts/dpkg-source.pl:528
+#: scripts/dpkg-source.pl:537
 msgid "fork for tar"
 msgstr "fork pour tar"
 
-#: scripts/dpkg-source.pl:531
+#: scripts/dpkg-source.pl:540
 #, perl-format
 msgid "chdir to above (orig) source %s"
 msgstr "chdir vers le répertoire supérieur (orig) %s"
 
-#: scripts/dpkg-source.pl:532
+#: scripts/dpkg-source.pl:541
 msgid "reopen gzip for tar"
 msgstr "réouverture de gzip pour tar"
 
-#: scripts/dpkg-source.pl:534
+#: scripts/dpkg-source.pl:543
 msgid "exec tar"
 msgstr "exec tar"
 
-#: scripts/dpkg-source.pl:538
+#: scripts/dpkg-source.pl:547
 msgid "wait for tar"
 msgstr "attente tar"
 
-#: scripts/dpkg-source.pl:541 scripts/dpkg-source.pl:713
+#: scripts/dpkg-source.pl:550 scripts/dpkg-source.pl:722
 #, perl-format
 msgid "unable to rename `%s' (newly created) to `%s'"
 msgstr "impossible de modifier %s (nouvellement créé) en %s"
 
-#: scripts/dpkg-source.pl:544 scripts/dpkg-source.pl:716
+#: scripts/dpkg-source.pl:553 scripts/dpkg-source.pl:725
 #, perl-format
 msgid "unable to change permission of `%s'"
 msgstr "impossible de modifier les permissions de %s"
 
-#: scripts/dpkg-source.pl:548
+#: scripts/dpkg-source.pl:557
 #, perl-format
 msgid "%s: building %s using existing %s"
 msgstr "%s : construction de %s à partir de %s"
 
-#: scripts/dpkg-source.pl:550
+#: scripts/dpkg-source.pl:559
 msgid "write using existing tar message"
 msgstr "écriture en utilisant le message tar existant"
 
-#: scripts/dpkg-source.pl:560
+#: scripts/dpkg-source.pl:569
 #, perl-format
 msgid ""
 "orig dir `%s' already exists, not overwriting, giving up; use -sA, -sK or -"
@@ -2051,493 +2048,493 @@ msgstr ""
 "le répertoire orig %s existe déjà, pas de modification, abandon ; utiliser -"
 "sA, -sK ou -sP pour forcer."
 
-#: scripts/dpkg-source.pl:567
+#: scripts/dpkg-source.pl:576
 #, perl-format
 msgid "unable to check for existence of orig dir `%s'"
 msgstr "impossible de vérifier l'existence du répertoire orig %s"
 
-#: scripts/dpkg-source.pl:577 scripts/dpkg-source.pl:938
+#: scripts/dpkg-source.pl:586 scripts/dpkg-source.pl:947
 #, perl-format
 msgid "unable to create `%s'"
 msgstr "impossible de créer %s"
 
-#: scripts/dpkg-source.pl:581 scripts/dpkg-source.pl:919
-#: scripts/dpkg-source.pl:942
+#: scripts/dpkg-source.pl:590 scripts/dpkg-source.pl:928
+#: scripts/dpkg-source.pl:951
 #, perl-format
 msgid "unable to rename `%s' to `%s'"
 msgstr "impossible de modifier %s en %s"
 
-#: scripts/dpkg-source.pl:585 scripts/dpkg-source.pl:944
+#: scripts/dpkg-source.pl:594 scripts/dpkg-source.pl:953
 #, perl-format
 msgid "unable to remove `%s'"
 msgstr "impossible de supprimer %s"
 
-#: scripts/dpkg-source.pl:594
+#: scripts/dpkg-source.pl:603
 msgid "write building diff message"
 msgstr "écriture du message concernant la construction du diff"
 
-#: scripts/dpkg-source.pl:599
+#: scripts/dpkg-source.pl:608
 msgid "fork for find"
 msgstr "fork pour find"
 
-#: scripts/dpkg-source.pl:601
+#: scripts/dpkg-source.pl:610
 #, perl-format
 msgid "chdir to %s for find"
 msgstr "chdir vers %s pour find"
 
-#: scripts/dpkg-source.pl:602
+#: scripts/dpkg-source.pl:611
 msgid "exec find"
 msgstr "exec find"
 
-#: scripts/dpkg-source.pl:611
+#: scripts/dpkg-source.pl:620
 #, perl-format
 msgid "cannot stat file %s"
 msgstr "stat impossible pour le fichier %s"
 
-#: scripts/dpkg-source.pl:618
+#: scripts/dpkg-source.pl:627
 #, perl-format
 msgid "cannot read link %s"
 msgstr "impossible de lire le lien %s"
 
-#: scripts/dpkg-source.pl:620
+#: scripts/dpkg-source.pl:629
 #, perl-format
 msgid "cannot read orig link %s"
 msgstr "impossible de lire le lien orig %s"
 
-#: scripts/dpkg-source.pl:621 scripts/dpkg-source.pl:622
+#: scripts/dpkg-source.pl:630 scripts/dpkg-source.pl:631
 #, perl-format
 msgid "symlink to %s"
 msgstr "lien symbolique vers %s"
 
-#: scripts/dpkg-source.pl:629 scripts/dpkg-source.pl:700
+#: scripts/dpkg-source.pl:638 scripts/dpkg-source.pl:709
 #, perl-format
 msgid "cannot stat orig file %s"
 msgstr "stat impossible sur fichier orig %s"
 
-#: scripts/dpkg-source.pl:632
+#: scripts/dpkg-source.pl:641
 #, perl-format
 msgid "newly created empty file '%s' will not be represented in diff"
 msgstr ""
 "le fichier « %s », nouvellement créé, ne sera pas représenté dans le diff"
 
-#: scripts/dpkg-source.pl:636
+#: scripts/dpkg-source.pl:645
 #, perl-format
 msgid "executable mode %04o of '%s' will not be represented in diff"
 msgstr "le mode exécutable %04o de « %s » ne sera pas représenté dans le diff"
 
-#: scripts/dpkg-source.pl:641
+#: scripts/dpkg-source.pl:650
 #, perl-format
 msgid "special mode %04o of '%s' will not be represented in diff"
 msgstr "le mode spécial %04o de « %s » ne sera pas représenté dans le diff"
 
-#: scripts/dpkg-source.pl:648 scripts/dpkg-source.pl:1523
+#: scripts/dpkg-source.pl:657 scripts/dpkg-source.pl:1532
 msgid "something else"
 msgstr "quelque chose d'autre"
 
-#: scripts/dpkg-source.pl:649
+#: scripts/dpkg-source.pl:658
 msgid "plain file"
 msgstr "simple fichier"
 
-#: scripts/dpkg-source.pl:652
+#: scripts/dpkg-source.pl:661
 msgid "fork for diff"
 msgstr "fork pour diff"
 
-#: scripts/dpkg-source.pl:661
+#: scripts/dpkg-source.pl:670
 msgid "exec diff"
 msgstr "exec diff"
 
-#: scripts/dpkg-source.pl:668
+#: scripts/dpkg-source.pl:677
 msgid "binary file contents changed"
 msgstr "contenu d'un fichier binaire modifié"
 
-#: scripts/dpkg-source.pl:673
+#: scripts/dpkg-source.pl:682
 #, perl-format
 msgid "file %s has no final newline (either original or modified version)"
 msgstr ""
 "fichier %s sans caractère nouvelle ligne terminal (soit l'original soit la "
 "version modifiée)"
 
-#: scripts/dpkg-source.pl:677
+#: scripts/dpkg-source.pl:686
 #, perl-format
 msgid "unknown line from diff -u on %s: `%s'"
 msgstr "ligne inconnue dans diff -u sur %s : `%s'"
 
-#: scripts/dpkg-source.pl:680
+#: scripts/dpkg-source.pl:689
 msgid "failed to write to compression pipe"
 msgstr "échec d'écriture vers pipe de compression"
 
-#: scripts/dpkg-source.pl:686
+#: scripts/dpkg-source.pl:695
 msgid "diff gave 1 but no diff lines found"
 msgstr "le résultat de diff est 1 mais pas de différence trouvée"
 
-#: scripts/dpkg-source.pl:689
+#: scripts/dpkg-source.pl:698
 #, perl-format
 msgid "diff on %s"
 msgstr "diff sur %s"
 
-#: scripts/dpkg-source.pl:695
+#: scripts/dpkg-source.pl:704
 msgid "device or socket is not allowed"
 msgstr "périphérique ou socket non autorisé"
 
-#: scripts/dpkg-source.pl:702
+#: scripts/dpkg-source.pl:711
 msgid "not a directory"
 msgstr "pas un répertoire"
 
-#: scripts/dpkg-source.pl:703
+#: scripts/dpkg-source.pl:712
 msgid "directory"
 msgstr "répertoire"
 
-#: scripts/dpkg-source.pl:706
+#: scripts/dpkg-source.pl:715
 #, perl-format
 msgid "unknown file type (%s)"
 msgstr "type de fichier inconnu %s"
 
-#: scripts/dpkg-source.pl:710
+#: scripts/dpkg-source.pl:719
 msgid "finish write to compression pipe"
 msgstr "fin de l'écriture sur pipe de compression"
 
-#: scripts/dpkg-source.pl:718
+#: scripts/dpkg-source.pl:727
 msgid "fork for 2nd find"
 msgstr "fork pour deuxième find"
 
-#: scripts/dpkg-source.pl:720
+#: scripts/dpkg-source.pl:729
 #, perl-format
 msgid "chdir to %s for 2nd find"
 msgstr "chdir vers %s pour deuxième find"
 
-#: scripts/dpkg-source.pl:721
+#: scripts/dpkg-source.pl:730
 msgid "exec 2nd find"
 msgstr "exécution du deuxième find"
 
-#: scripts/dpkg-source.pl:730
+#: scripts/dpkg-source.pl:739
 #, perl-format
 msgid "cannot check orig file %s"
 msgstr "impossible de vérifier fichier orig %s"
 
-#: scripts/dpkg-source.pl:732
+#: scripts/dpkg-source.pl:741
 #, perl-format
 msgid "ignoring deletion of file %s"
 msgstr "suppression du fichier %s ignorée"
 
-#: scripts/dpkg-source.pl:734
+#: scripts/dpkg-source.pl:743
 #, perl-format
 msgid "ignoring deletion of directory %s"
 msgstr "suppression du répertoire %s ignorée"
 
-#: scripts/dpkg-source.pl:736
+#: scripts/dpkg-source.pl:745
 #, perl-format
 msgid "ignoring deletion of symlink %s"
 msgstr "suppression du lien symbolique %s ignorée"
 
-#: scripts/dpkg-source.pl:738
+#: scripts/dpkg-source.pl:747
 msgid "not a file, directory or link"
 msgstr "ni un fichier ni un répertoire ni un lien symbolique"
 
-#: scripts/dpkg-source.pl:739 scripts/dpkg-source.pl:1518
+#: scripts/dpkg-source.pl:748 scripts/dpkg-source.pl:1527
 msgid "nonexistent"
 msgstr "inexistant"
 
-#: scripts/dpkg-source.pl:754
+#: scripts/dpkg-source.pl:763
 msgid "write building message"
 msgstr "écriture du message de construction"
 
-#: scripts/dpkg-source.pl:756
+#: scripts/dpkg-source.pl:765
 #, perl-format
 msgid "create %s"
 msgstr "création de %s"
 
-#: scripts/dpkg-source.pl:762
+#: scripts/dpkg-source.pl:771
 #, perl-format
 msgid "%s: unrepresentable changes to source"
 msgstr "%s : modifications non représentables des sources"
 
-#: scripts/dpkg-source.pl:763
+#: scripts/dpkg-source.pl:772
 #, perl-format
 msgid "write error msg: %s"
 msgstr "écriture du message d'erreur : %s"
 
-#: scripts/dpkg-source.pl:772
+#: scripts/dpkg-source.pl:781
 #, perl-format
 msgid "source handling style -s%s not allowed with -x"
 msgstr "gestion des sources avec -s%s non autorisée avec -x"
 
-#: scripts/dpkg-source.pl:775
+#: scripts/dpkg-source.pl:784
 msgid "-x needs at least one argument, the .dsc"
 msgstr "-x demande au moins un paramètre, le fichier .dsc"
 
-#: scripts/dpkg-source.pl:776
+#: scripts/dpkg-source.pl:785
 msgid "-x takes no more than two arguments"
 msgstr "-x ne prend pas plus de deux paramètres"
 
-#: scripts/dpkg-source.pl:780
+#: scripts/dpkg-source.pl:789
 msgid "-x needs the .dsc file as first argument, not a directory"
 msgstr "-x demande le fichier .dsc comme premier paramètre, pas un répertoire"
 
-#: scripts/dpkg-source.pl:788
+#: scripts/dpkg-source.pl:797
 #, perl-format
 msgid "unpack target exists: %s"
 msgstr "cible non compressée existe : %s"
 
-#: scripts/dpkg-source.pl:792 scripts/dpkg-source.pl:823
+#: scripts/dpkg-source.pl:801 scripts/dpkg-source.pl:832
 #, perl-format
 msgid "cannot open .dsc file %s: %s"
 msgstr "impossible d'ouvrir le fichier .dsc %s : %s"
 
-#: scripts/dpkg-source.pl:812
+#: scripts/dpkg-source.pl:821
 #, perl-format
 msgid "failed to verify signature on %s"
 msgstr "impossible de vérifier la signature sur %s"
 
-#: scripts/dpkg-source.pl:816
+#: scripts/dpkg-source.pl:825
 #, perl-format
 msgid "could not verify signature on %s since gpg isn't installed"
 msgstr "impossible de vérifier la signature sur %s, gpg n'est pas installé"
 
-#: scripts/dpkg-source.pl:820
+#: scripts/dpkg-source.pl:829
 #, perl-format
 msgid "extracting unsigned source package (%s)"
 msgstr "extraction d'un paquet source non signé (%s)"
 
-#: scripts/dpkg-source.pl:829
+#: scripts/dpkg-source.pl:838
 #, perl-format
 msgid "missing critical source control field %s"
 msgstr "un champ de contrôle vital manque, %s"
 
-#: scripts/dpkg-source.pl:835
+#: scripts/dpkg-source.pl:844
 #, perl-format
 msgid "Unsupported format of .dsc file (%s)"
 msgstr "Format du fichier .dsc non reconnu, (%s)"
 
-#: scripts/dpkg-source.pl:867
+#: scripts/dpkg-source.pl:876
 #, perl-format
 msgid "Files field contains invalid filename `%s'"
 msgstr "Le champ Files contient un nom invalide, %s"
 
-#: scripts/dpkg-source.pl:872
+#: scripts/dpkg-source.pl:881
 #, perl-format
 msgid "repeated file type - files `%s' and `%s'"
 msgstr "type de fichier répété : fichiers %s et %s"
 
-#: scripts/dpkg-source.pl:886
+#: scripts/dpkg-source.pl:895
 #, perl-format
 msgid "unrecognised file type - `%s'"
 msgstr "format de fichier non reconnu, %s"
 
-#: scripts/dpkg-source.pl:890
+#: scripts/dpkg-source.pl:899
 msgid "no tarfile in Files field"
 msgstr "pas de fichier tar dans le champ Files"
 
-#: scripts/dpkg-source.pl:893
+#: scripts/dpkg-source.pl:902
 msgid "multiple tarfiles in native package"
 msgstr "plusieurs fichiers tar dans un paquet natif"
 
-#: scripts/dpkg-source.pl:894
+#: scripts/dpkg-source.pl:903
 msgid "native package with .orig.tar"
 msgstr "paquet natif avec .orig.tar"
 
-#: scripts/dpkg-source.pl:897
+#: scripts/dpkg-source.pl:906
 msgid "no upstream tarfile in Files field"
 msgstr "pas de tar amont dans le champ Files"
 
-#: scripts/dpkg-source.pl:900
+#: scripts/dpkg-source.pl:909
 #, perl-format
 msgid "multiple upstream tarballs in %s format dsc"
 msgstr "plusieurs fichiers tar amont dans le dsc format %s"
 
-#: scripts/dpkg-source.pl:902
+#: scripts/dpkg-source.pl:911
 #, perl-format
 msgid "debian.tar in %s format dsc"
 msgstr "debian.tar dans le dsc format %s"
 
-#: scripts/dpkg-source.pl:912
+#: scripts/dpkg-source.pl:921
 #, perl-format
 msgid "%s: extracting %s in %s"
 msgstr "%s : extraction de %s dans %s"
 
-#: scripts/dpkg-source.pl:914
+#: scripts/dpkg-source.pl:923
 msgid "write extracting message"
 msgstr "écriture du message d'extraction"
 
-#: scripts/dpkg-source.pl:939
+#: scripts/dpkg-source.pl:948
 #, perl-format
 msgid "%s: unpacking %s"
 msgstr "%s : extraction de %s"
 
-#: scripts/dpkg-source.pl:952
+#: scripts/dpkg-source.pl:961
 #, perl-format
 msgid "failed to stat `%s' to see if need to copy"
 msgstr "stat de %s, impossible de savoir si copie nécessaire"
 
-#: scripts/dpkg-source.pl:964
+#: scripts/dpkg-source.pl:973
 #, perl-format
 msgid "failed to check destination `%s' to see if need to copy"
 msgstr "vérification de %s, impossible de savoir si copie nécessaire"
 
-#: scripts/dpkg-source.pl:977
+#: scripts/dpkg-source.pl:986
 msgid "unable to keep orig directory (already exists)"
 msgstr "impossible de garder répertoire orig, il existe déjà"
 
-#: scripts/dpkg-source.pl:1011 scripts/dpkg-source.pl:1071
+#: scripts/dpkg-source.pl:1020 scripts/dpkg-source.pl:1080
 #, perl-format
 msgid "cannot stat %s"
 msgstr "stat de %s impossible"
 
-#: scripts/dpkg-source.pl:1013
+#: scripts/dpkg-source.pl:1022
 #, perl-format
 msgid "failed to create %s subdirectory"
 msgstr "impossible de créer le sous-répertoire %s"
 
-#: scripts/dpkg-source.pl:1016
+#: scripts/dpkg-source.pl:1025
 #, perl-format
 msgid "diff patches file in directory `%s', but %s isn't a directory !"
 msgstr ""
 "modification de fichier dans le répertoire %s, mais %s n'est pas un "
 "répertoire."
 
-#: scripts/dpkg-source.pl:1026
+#: scripts/dpkg-source.pl:1035
 #, perl-format
 msgid "failed to rename newly-extracted %s to %s"
 msgstr "impossible de modifier le fichier extrait %s en %s"
 
-#: scripts/dpkg-source.pl:1032
+#: scripts/dpkg-source.pl:1041
 #, perl-format
 msgid "failed to rename saved %s to %s"
 msgstr "impossible de modifier le fichier sauvegardé %s en %s"
 
-#: scripts/dpkg-source.pl:1037
+#: scripts/dpkg-source.pl:1046
 #, perl-format
 msgid "%s: applying %s"
 msgstr "%s : mise en place de %s"
 
-#: scripts/dpkg-source.pl:1042 scripts/dpkg-source.pl:1353
+#: scripts/dpkg-source.pl:1051 scripts/dpkg-source.pl:1362
 #, perl-format
 msgid "can't open diff `%s'"
 msgstr "impossible d'ouvrir %s"
 
-#: scripts/dpkg-source.pl:1045
+#: scripts/dpkg-source.pl:1054
 msgid "fork for patch"
 msgstr "fork pour patch"
 
-#: scripts/dpkg-source.pl:1047
+#: scripts/dpkg-source.pl:1056
 msgid "reopen gzip for patch"
 msgstr "réouverture de gzip pour patch"
 
-#: scripts/dpkg-source.pl:1048
+#: scripts/dpkg-source.pl:1057
 #, perl-format
 msgid "chdir to %s for patch"
 msgstr "chdir vers %s pour patch"
 
-#: scripts/dpkg-source.pl:1052
+#: scripts/dpkg-source.pl:1061
 msgid "exec patch"
 msgstr "exec patch"
 
-#: scripts/dpkg-source.pl:1055
+#: scripts/dpkg-source.pl:1064
 msgid "wait for patch"
 msgstr "attente patch"
 
-#: scripts/dpkg-source.pl:1065
+#: scripts/dpkg-source.pl:1074
 #, perl-format
 msgid "cannot change timestamp for %s"
 msgstr "impossible de modifier la date de %s"
 
-#: scripts/dpkg-source.pl:1067
+#: scripts/dpkg-source.pl:1076
 #, perl-format
 msgid "remove patch backup file %s"
 msgstr "suppression du fichier de sauvegarde %s"
 
-#: scripts/dpkg-source.pl:1072
+#: scripts/dpkg-source.pl:1081
 #, perl-format
 msgid "%s does not exist"
 msgstr "%s n'existe pas"
 
-#: scripts/dpkg-source.pl:1075
+#: scripts/dpkg-source.pl:1084
 #, perl-format
 msgid "cannot make %s executable"
 msgstr "impossible de rendre %s exécutable"
 
-#: scripts/dpkg-source.pl:1077
+#: scripts/dpkg-source.pl:1086
 #, perl-format
 msgid "%s is not a plain file"
 msgstr "%s n'est pas un fichier normal"
 
-#: scripts/dpkg-source.pl:1081
+#: scripts/dpkg-source.pl:1090
 msgid "cannot stat `.'"
 msgstr "stat de « . » impossible"
 
-#: scripts/dpkg-source.pl:1089
+#: scripts/dpkg-source.pl:1098
 #, perl-format
 msgid "cannot stat extracted object `%s'"
 msgstr "stat de l'objet extrait %s impossible"
 
-#: scripts/dpkg-source.pl:1100
+#: scripts/dpkg-source.pl:1109
 #, perl-format
 msgid "unknown object `%s' after extract (mode 0%o)"
 msgstr "objet %s inconnu, après extraction (mode 0%o)"
 
-#: scripts/dpkg-source.pl:1105
+#: scripts/dpkg-source.pl:1114
 #, perl-format
 msgid "cannot change mode of `%s' to 0%o from 0%o"
 msgstr "impossible de changer le mode de %s en 0%o, de 0%o"
 
-#: scripts/dpkg-source.pl:1116
+#: scripts/dpkg-source.pl:1125
 #, perl-format
 msgid "cannot read %s"
 msgstr "impossible de lire %s"
 
-#: scripts/dpkg-source.pl:1117
+#: scripts/dpkg-source.pl:1126
 #, perl-format
 msgid "cannot fstat %s"
 msgstr "fstat de %s impossible"
 
-#: scripts/dpkg-source.pl:1118
+#: scripts/dpkg-source.pl:1127
 #, perl-format
 msgid "file %s has size %s instead of expected %s"
 msgstr "la taille du fichier %s est %s au lieu de %s"
 
-#: scripts/dpkg-source.pl:1122
+#: scripts/dpkg-source.pl:1131
 #, perl-format
 msgid "file %s has md5sum %s instead of expected %s"
 msgstr "md5sum du fichier %s est %s au lieu de %s"
 
-#: scripts/dpkg-source.pl:1124
+#: scripts/dpkg-source.pl:1133
 msgid "reopen stdin from /dev/null"
 msgstr "réouverture de stdin depuis /dev/null"
 
-#: scripts/dpkg-source.pl:1131
+#: scripts/dpkg-source.pl:1140
 #, perl-format
 msgid "cannot stat directory %s (before removal)"
 msgstr "stat du répertoire %s impossible (avant suppression)"
 
-#: scripts/dpkg-source.pl:1137
+#: scripts/dpkg-source.pl:1146
 #, perl-format
 msgid "unable to check for removal of dir `%s'"
 msgstr "impossible de vérifier la suppression du répertoire %s"
 
-#: scripts/dpkg-source.pl:1139
+#: scripts/dpkg-source.pl:1148
 #, perl-format
 msgid "rm -rf failed to remove `%s'"
 msgstr "rm -rf n'a pas supprimé %s"
 
-#: scripts/dpkg-source.pl:1151
+#: scripts/dpkg-source.pl:1160
 msgid "fork for cpio"
 msgstr "fork pour cpio"
 
-#: scripts/dpkg-source.pl:1155
+#: scripts/dpkg-source.pl:1164
 msgid "reopen gzip for cpio"
 msgstr "réouverture de gzip pour cpio"
 
-#: scripts/dpkg-source.pl:1157
+#: scripts/dpkg-source.pl:1166
 msgid "exec cpio"
 msgstr "exec cpio"
 
-#: scripts/dpkg-source.pl:1171
+#: scripts/dpkg-source.pl:1180
 #, perl-format
 msgid "tarfile `%s' contains object with newline in its name (%s)"
 msgstr ""
 "le fichier tar %s contient un objet avec un caractère nouvelle ligne dans "
 "son nom (%s)"
 
-#: scripts/dpkg-source.pl:1179
+#: scripts/dpkg-source.pl:1188
 #, perl-format
 msgid ""
 "first output from cpio -0t (from `%s') contains newline - you probably have "
@@ -2547,7 +2544,7 @@ msgstr ""
 "Votre version de cpio est sans doute ancienne. Cela fonctionne avec GNU cpio "
 "2.4.2-2."
 
-#: scripts/dpkg-source.pl:1188
+#: scripts/dpkg-source.pl:1197
 #, perl-format
 msgid ""
 "tarfile `%s' does not extract into a directory off the current directory (%s "
@@ -2556,76 +2553,76 @@ msgstr ""
 "le fichier tar %s ne s'extrait pas dans un répertoire hors du répertoire "
 "courant (%s, de %s)"
 
-#: scripts/dpkg-source.pl:1197
+#: scripts/dpkg-source.pl:1206
 #, perl-format
 msgid "tarfile `%s' contains object (%s) not in expected directory (%s)"
 msgstr ""
 "le fichier tar %s contient un objet (%s) qui n'est pas dans le répertoire "
 "attendu (%s)"
 
-#: scripts/dpkg-source.pl:1203 scripts/dpkg-source.pl:1303
+#: scripts/dpkg-source.pl:1212 scripts/dpkg-source.pl:1312
 #, perl-format
 msgid "tarfile `%s' contains object with /../ in its name (%s)"
 msgstr "le fichier tar %s contient un objet avec /../ dans son nom (%s)"
 
-#: scripts/dpkg-source.pl:1230
+#: scripts/dpkg-source.pl:1239
 msgid "fork for tar -t"
 msgstr "fork pour tar -t"
 
-#: scripts/dpkg-source.pl:1234
+#: scripts/dpkg-source.pl:1243
 msgid "reopen gzip for tar -t"
 msgstr "réouverture de gzip pour tar -t"
 
-#: scripts/dpkg-source.pl:1235
+#: scripts/dpkg-source.pl:1244
 msgid "exec tar -vvtf -"
 msgstr "exec tar -vvtf -"
 
-#: scripts/dpkg-source.pl:1245
+#: scripts/dpkg-source.pl:1254
 #, perl-format
 msgid "tarfile `%s' contains unknown object listed by tar as `%s'"
 msgstr "le fichier tar %s contient un objet inconnu, listé %s"
 
-#: scripts/dpkg-source.pl:1252
+#: scripts/dpkg-source.pl:1261
 #, perl-format
 msgid "tarfile `%s' contains object `%s' with unknown or forbidden type `%s'"
 msgstr "le fichier tar %s contient un objet %s de type inconnu ou interdit %s"
 
-#: scripts/dpkg-source.pl:1262
+#: scripts/dpkg-source.pl:1271
 #, perl-format
 msgid "tarfile `%s' contains incomplete entry `%s'\n"
 msgstr "le fichier tar %s contient une entrée incomplète %s\n"
 
-#: scripts/dpkg-source.pl:1286
+#: scripts/dpkg-source.pl:1295
 #, perl-format
 msgid "filename '%s' was truncated by cpio; unable to check full pathname"
 msgstr ""
 "le nom de fichier « %s » a été tronqué par cpio ; impossible de vérifier le "
 "nom complet."
 
-#: scripts/dpkg-source.pl:1293
+#: scripts/dpkg-source.pl:1302
 #, perl-format
 msgid ""
 "tarfile `%s' contains unexpected object listed by tar as `%s'; expected `%s'"
 msgstr "le fichier tar %s contient un objet inattendu, listé %s, %s attendu"
 
-#: scripts/dpkg-source.pl:1308
+#: scripts/dpkg-source.pl:1317
 #, perl-format
 msgid "tarfile `%s' contains file with name ending in .dpkg-orig"
 msgstr ""
 "le fichier tar %s contient un fichier dont le nom se termine par .dpkg-orig"
 
-#: scripts/dpkg-source.pl:1313
+#: scripts/dpkg-source.pl:1322
 #, perl-format
 msgid "tarfile `%s' contains setuid, setgid or sticky object `%s'"
 msgstr "le fichier tar %s contient un objet %s setuid, setgid ou sticky"
 
-#: scripts/dpkg-source.pl:1318
+#: scripts/dpkg-source.pl:1327
 #, perl-format
 msgid "tarfile `%s' contains object `debian' that isn't a directory"
 msgstr ""
 "le fichier tar %s contient un objet « debian » qui n'est pas un répertoire"
 
-#: scripts/dpkg-source.pl:1327
+#: scripts/dpkg-source.pl:1336
 #, perl-format
 msgid ""
 "tarfile `%s' contains object `%s' but its containing directory `%s' does not "
@@ -2634,132 +2631,132 @@ msgstr ""
 "le fichier tar %s contient un objet %s mais le répertoire %s qui le contient "
 "ne le précède pas"
 
-#: scripts/dpkg-source.pl:1365 scripts/dpkg-source.pl:1410
-#: scripts/dpkg-source.pl:1421
+#: scripts/dpkg-source.pl:1374 scripts/dpkg-source.pl:1419
+#: scripts/dpkg-source.pl:1430
 #, perl-format
 msgid "diff `%s' is missing trailing newline"
 msgstr "le caractère nouvelle ligne manque dans diff %s"
 
-#: scripts/dpkg-source.pl:1367
+#: scripts/dpkg-source.pl:1376
 #, perl-format
 msgid "expected ^--- in line %d of diff `%s'"
 msgstr "dans la ligne %d du diff %s, « ^--- » attendu"
 
-#: scripts/dpkg-source.pl:1370
+#: scripts/dpkg-source.pl:1379
 #, perl-format
 msgid "diff `%s' patches file with no subdirectory"
 msgstr "diff %s modifie un fichier sans sous-répertoire"
 
-#: scripts/dpkg-source.pl:1372
+#: scripts/dpkg-source.pl:1381
 #, perl-format
 msgid "diff `%s' patches file with name ending .dpkg-orig"
 msgstr "diff %s modifie un fichier dont le nom de termine par .dpkg-orig"
 
-#: scripts/dpkg-source.pl:1377
+#: scripts/dpkg-source.pl:1386
 #, perl-format
 msgid "diff `%s' finishes in middle of ---/+++ (line %d)"
 msgstr "diff %s se termine au milieu de ---/+++ (ligne %d)"
 
-#: scripts/dpkg-source.pl:1382 scripts/dpkg-source.pl:1389
+#: scripts/dpkg-source.pl:1391 scripts/dpkg-source.pl:1398
 #, perl-format
 msgid "line after --- isn't as expected in diff `%s' (line %d)"
 msgstr "ligne après --- n'est pas comme attendu dans diff %s (ligne %d)"
 
-#: scripts/dpkg-source.pl:1398
+#: scripts/dpkg-source.pl:1407
 #, perl-format
 msgid "diff `%s' patches something which is not a plain file"
 msgstr "diff %s modifie un objet qui n'est pas un fichier normal"
 
-#: scripts/dpkg-source.pl:1403
+#: scripts/dpkg-source.pl:1412
 #, perl-format
 msgid "diff patches file %s twice"
 msgstr "diff modifie deux fois le fichier %s"
 
-#: scripts/dpkg-source.pl:1413
+#: scripts/dpkg-source.pl:1422
 #, perl-format
 msgid "Expected ^@@ in line %d of diff `%s'"
 msgstr "^@@ attendu ligne %d du diff %s"
 
-#: scripts/dpkg-source.pl:1419
+#: scripts/dpkg-source.pl:1428
 #, perl-format
 msgid "unexpected end of diff `%s'"
 msgstr "fin inattendue de diff %s"
 
-#: scripts/dpkg-source.pl:1427
+#: scripts/dpkg-source.pl:1436
 #, perl-format
 msgid "expected [ +-] at start of line %d of diff `%s'"
 msgstr "[ +-] attendu au début de la ligne %d du diff %s"
 
-#: scripts/dpkg-source.pl:1432
+#: scripts/dpkg-source.pl:1441
 #, perl-format
 msgid "expected ^@@ at line %d of diff `%s'"
 msgstr "^@@ attendu ligne %d du diff %s"
 
-#: scripts/dpkg-source.pl:1443
+#: scripts/dpkg-source.pl:1452
 msgid "fork for tar -xkf -"
 msgstr "fork pour tar -xkf -"
 
-#: scripts/dpkg-source.pl:1445
+#: scripts/dpkg-source.pl:1454
 msgid "reopen gzip for tar -xkf -"
 msgstr "réouverture de gzip pour tar -xkf -"
 
-#: scripts/dpkg-source.pl:1448
+#: scripts/dpkg-source.pl:1457
 #, perl-format
 msgid "cannot chdir to `%s' for tar extract"
 msgstr "impossible de changer de répertoire, vers %s, pour tar extract"
 
-#: scripts/dpkg-source.pl:1450
+#: scripts/dpkg-source.pl:1459
 msgid "exec tar -xkf -"
 msgstr "exec tar -xkf -"
 
-#: scripts/dpkg-source.pl:1453
+#: scripts/dpkg-source.pl:1462
 msgid "wait for tar -xkf -"
 msgstr "attente tar -xkf -"
 
-#: scripts/dpkg-source.pl:1485
+#: scripts/dpkg-source.pl:1494
 #, perl-format
 msgid "Unable to open dir %s"
 msgstr "impossible d'ouvrir le répertoire %s"
 
-#: scripts/dpkg-source.pl:1487
+#: scripts/dpkg-source.pl:1496
 #, perl-format
 msgid "Unable to close dir %s"
 msgstr "impossible de fermer le répertoire %s"
 
-#: scripts/dpkg-source.pl:1490 scripts/dpkg-source.pl:1498
-#: scripts/dpkg-source.pl:1503
+#: scripts/dpkg-source.pl:1499 scripts/dpkg-source.pl:1507
+#: scripts/dpkg-source.pl:1512
 #, perl-format
 msgid "Unable to rename %s to %s"
 msgstr "impossible de modifier %s en %s"
 
-#: scripts/dpkg-source.pl:1495
+#: scripts/dpkg-source.pl:1504
 #, perl-format
 msgid "Unable to mkdir %s"
 msgstr "mkdir %s impossible"
 
-#: scripts/dpkg-source.pl:1511
+#: scripts/dpkg-source.pl:1520
 msgid "reopen stderr for tar to grep out blocks message"
 msgstr "réouverture de stderr pour tar pour filtrer les messages blocks"
 
-#: scripts/dpkg-source.pl:1521
+#: scripts/dpkg-source.pl:1530
 #, perl-format
 msgid "checktype %s (%s)"
 msgstr "checktype %s (%s)"
 
-#: scripts/dpkg-source.pl:1529
+#: scripts/dpkg-source.pl:1538
 msgid "only one of -x or -b allowed, and only once"
 msgstr "une seule option -x ou -b autorisée, et une seule fois"
 
-#: scripts/dpkg-source.pl:1534
+#: scripts/dpkg-source.pl:1543
 #, perl-format
 msgid "%s: cannot represent change to %s: %s"
 msgstr "%s : impossible de représenter les changements de %s : %s"
 
-#: scripts/dpkg-source.pl:1536 scripts/dpkg-source.pl:1545
+#: scripts/dpkg-source.pl:1545 scripts/dpkg-source.pl:1554
 msgid "write syserr unrep"
 msgstr "write syserr unrep"
 
-#: scripts/dpkg-source.pl:1541
+#: scripts/dpkg-source.pl:1550
 #, perl-format
 msgid ""
 "%s: cannot represent change to %s:\n"
@@ -2770,80 +2767,80 @@ msgstr ""
 "%s :  la nouvelle version est %s\n"
 "%s :  l'ancienne version est %s\n"
 
-#: scripts/dpkg-source.pl:1563 scripts/dpkg-source.pl:1594
+#: scripts/dpkg-source.pl:1572 scripts/dpkg-source.pl:1603
 #, perl-format
 msgid "unknown compression type on file %s"
 msgstr "type de compression inconnu pour le fichier %s"
 
-#: scripts/dpkg-source.pl:1570
+#: scripts/dpkg-source.pl:1579
 #, perl-format
 msgid "create file %s"
 msgstr "création du fichier %s"
 
-#: scripts/dpkg-source.pl:1571
+#: scripts/dpkg-source.pl:1580
 msgid "pipe for gzip"
 msgstr "pipe pour gzip"
 
-#: scripts/dpkg-source.pl:1572
+#: scripts/dpkg-source.pl:1581
 msgid "fork for gzip"
 msgstr "fork pour gzip"
 
-#: scripts/dpkg-source.pl:1574
+#: scripts/dpkg-source.pl:1583
 msgid "reopen gzip pipe"
 msgstr "réouverture de pipe gzip"
 
-#: scripts/dpkg-source.pl:1576
+#: scripts/dpkg-source.pl:1585
 msgid "reopen tar"
 msgstr "réouverture tar"
 
-#: scripts/dpkg-source.pl:1577
+#: scripts/dpkg-source.pl:1586
 msgid "exec gzip"
 msgstr "exec gzip"
 
-#: scripts/dpkg-source.pl:1597
+#: scripts/dpkg-source.pl:1606
 #, perl-format
 msgid "read file %s"
 msgstr "lecture du fichier %s"
 
-#: scripts/dpkg-source.pl:1598
+#: scripts/dpkg-source.pl:1607
 #, perl-format
 msgid "pipe for %s"
 msgstr "pipe pour %s"
 
-#: scripts/dpkg-source.pl:1599
+#: scripts/dpkg-source.pl:1608
 #, perl-format
 msgid "fork for %s"
 msgstr "fork for %s"
 
-#: scripts/dpkg-source.pl:1601
+#: scripts/dpkg-source.pl:1610
 #, perl-format
 msgid "reopen %s pipe"
 msgstr "reopen %s pipe"
 
-#: scripts/dpkg-source.pl:1603
+#: scripts/dpkg-source.pl:1612
 msgid "reopen input file"
 msgstr "réouverture du fichier d'entrée"
 
-#: scripts/dpkg-source.pl:1604
+#: scripts/dpkg-source.pl:1613
 #, perl-format
 msgid "exec %s"
 msgstr "exec %s"
 
-#: scripts/dpkg-source.pl:1611
+#: scripts/dpkg-source.pl:1620
 msgid "wait for gzip"
 msgstr "attente gzip"
 
-#: scripts/dpkg-source.pl:1621
+#: scripts/dpkg-source.pl:1630
 #, perl-format
 msgid "tried to add file `%s' twice"
 msgstr "fichier %s ajouté deux fois"
 
-#: scripts/dpkg-source.pl:1622
+#: scripts/dpkg-source.pl:1631
 #, perl-format
 msgid "could not stat output file `%s'"
 msgstr "stat du fichier %s impossible"
 
-#: scripts/dpkg-source.pl:1643
+#: scripts/dpkg-source.pl:1652
 #, perl-format
 msgid "bogus character `\\%s' in `%s'"
 msgstr "caractère anormal \\%s dans %s"
@@ -3003,29 +3000,29 @@ msgstr "impossible d'ex
 msgid "Couldn't parse dynamic symbol definition: %s"
 msgstr "Impossible d'analyser la définition de symboles dynamique : %s"
 
-#: scripts/Dpkg/Shlibs/SymbolFile.pm:101
+#: scripts/Dpkg/Shlibs/SymbolFile.pm:103
 #, perl-format
 msgid "Can't open %s: %s"
 msgstr "Impossible d'ouvrir %s : %s"
 
-#: scripts/Dpkg/Shlibs/SymbolFile.pm:107
+#: scripts/Dpkg/Shlibs/SymbolFile.pm:109
 #, perl-format
 msgid "Symbol information must be preceded by a header (file %s, line %s)."
 msgstr ""
 "Les informations de symboles doivent être précédées par un en-tête (fichier %"
 "s, ligne %s)."
 
-#: scripts/Dpkg/Shlibs/SymbolFile.pm:147
+#: scripts/Dpkg/Shlibs/SymbolFile.pm:149
 #, perl-format
 msgid "Failed to parse a line in %s: %s"
 msgstr "Impossible d'analyser une ligne dans %s : %s"
 
-#: scripts/Dpkg/Shlibs/SymbolFile.pm:161
+#: scripts/Dpkg/Shlibs/SymbolFile.pm:163
 #, perl-format
 msgid "Can't open %s for writing: %s"
 msgstr "Impossible d'ouvrir %s en écriture : %s"
 
-#: scripts/Dpkg/Shlibs/SymbolFile.pm:194
+#: scripts/Dpkg/Shlibs/SymbolFile.pm:196
 msgid "Can't merge symbols from objects without SONAME."
 msgstr "Impossible de fusionner les symboles depuis des objets sans SONAME."
 
diff --git a/scripts/po/pl.po b/scripts/po/pl.po
index 6977ee6c..d00fc647 100644
--- a/scripts/po/pl.po
+++ b/scripts/po/pl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14.17\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\n"
 "PO-Revision-Date: 2007-11-15 20:15+0200\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -112,8 +112,8 @@ msgstr "nie mo
 msgid "fork for parse changelog"
 msgstr "fork w celu przetwarzania pliku zmian"
 
-#: scripts/controllib.pl:191 scripts/dpkg-genchanges.pl:305
-#: scripts/dpkg-gencontrol.pl:220 scripts/dpkg-source.pl:380
+#: scripts/controllib.pl:191 scripts/dpkg-genchanges.pl:306
+#: scripts/dpkg-gencontrol.pl:220 scripts/dpkg-source.pl:381
 msgid "parsed version of changelog"
 msgstr "przetworzona wersja pliku zmian"
 
@@ -185,11 +185,11 @@ msgid "syntax error in %s at line %d: %s"
 msgstr "b³±d sk³adni w %s w linii %d: %s"
 
 #: scripts/dpkg-architecture.pl:35 scripts/dpkg-buildpackage.pl:21
-#: scripts/dpkg-distaddfile.pl:21 scripts/dpkg-genchanges.pl:82
+#: scripts/dpkg-distaddfile.pl:21 scripts/dpkg-genchanges.pl:83
 #: scripts/dpkg-gencontrol.pl:50 scripts/dpkg-gensymbols.pl:36
 #: scripts/dpkg-parsechangelog.pl:24 scripts/dpkg-scanpackages.pl:51
-#: scripts/dpkg-scansources.pl:96 scripts/dpkg-shlibdeps.pl:357
-#: scripts/dpkg-source.pl:138 scripts/changelog/debian.pl:31
+#: scripts/dpkg-scansources.pl:96 scripts/dpkg-shlibdeps.pl:359
+#: scripts/dpkg-source.pl:139 scripts/changelog/debian.pl:31
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s w wersji %s.\n"
@@ -205,10 +205,10 @@ msgstr ""
 "Copyright (C) 2004-2005 Scott James Remnant <scott@netsplit.com>."
 
 #: scripts/dpkg-architecture.pl:41 scripts/dpkg-buildpackage.pl:28
-#: scripts/dpkg-distaddfile.pl:26 scripts/dpkg-genchanges.pl:88
+#: scripts/dpkg-distaddfile.pl:26 scripts/dpkg-genchanges.pl:89
 #: scripts/dpkg-gencontrol.pl:56 scripts/dpkg-gensymbols.pl:42
-#: scripts/dpkg-parsechangelog.pl:30 scripts/dpkg-shlibdeps.pl:366
-#: scripts/dpkg-source.pl:143 scripts/changelog/debian.pl:35
+#: scripts/dpkg-parsechangelog.pl:30 scripts/dpkg-shlibdeps.pl:368
+#: scripts/dpkg-source.pl:144 scripts/changelog/debian.pl:35
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -262,9 +262,9 @@ msgstr ""
 "  --version          wy¶wietla informacje o wersji programu.\n"
 
 #: scripts/dpkg-architecture.pl:120 scripts/dpkg-distaddfile.pl:54
-#: scripts/dpkg-genchanges.pl:177 scripts/dpkg-gencontrol.pl:129
+#: scripts/dpkg-genchanges.pl:178 scripts/dpkg-gencontrol.pl:129
 #: scripts/dpkg-gensymbols.pl:108 scripts/dpkg-shlibdeps.pl:82
-#: scripts/dpkg-source.pl:268 scripts/changelog/debian.pl:64
+#: scripts/dpkg-source.pl:269 scripts/changelog/debian.pl:64
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "nieznana opcja `%s'"
@@ -553,7 +553,7 @@ msgid "%s: Build conflicts: "
 msgstr "%s: Konfliktu budowania pakietu:"
 
 #: scripts/dpkg-checkbuilddeps.pl:157 scripts/dpkg-gencontrol.pl:261
-#: scripts/dpkg-gencontrol.pl:268 scripts/dpkg-source.pl:319
+#: scripts/dpkg-gencontrol.pl:268 scripts/dpkg-source.pl:320
 #, perl-format
 msgid "error occurred while parsing %s"
 msgstr "wyst±pi³ b³±d podczas przetwarzania %s"
@@ -616,7 +616,7 @@ msgstr "zapisywanie nowego wpisu do nowego pliku z list
 msgid "close new files list file"
 msgstr "zamykanie nowego pliku z list± plików"
 
-#: scripts/dpkg-genchanges.pl:84
+#: scripts/dpkg-genchanges.pl:85
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson.\n"
@@ -626,7 +626,7 @@ msgstr ""
 "Copyright (C) 1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 
-#: scripts/dpkg-genchanges.pl:96
+#: scripts/dpkg-genchanges.pl:97
 #, fuzzy, perl-format
 msgid ""
 "Usage: %s [<option> ...]\n"
@@ -690,170 +690,170 @@ msgstr ""
 "  -h, --help               wy¶wietla ten komunikat pomocy.\n"
 "  --version                wy¶wietla informacje o wersji programu.\n"
 
-#: scripts/dpkg-genchanges.pl:129 scripts/dpkg-genchanges.pl:132
-#: scripts/dpkg-genchanges.pl:136 scripts/dpkg-genchanges.pl:140
+#: scripts/dpkg-genchanges.pl:130 scripts/dpkg-genchanges.pl:133
+#: scripts/dpkg-genchanges.pl:137 scripts/dpkg-genchanges.pl:141
 #, fuzzy, perl-format
 msgid "cannot combine %s and -S"
 msgstr "nie mo¿na ³±czyæ %s i %s"
 
-#: scripts/dpkg-genchanges.pl:134
+#: scripts/dpkg-genchanges.pl:135
 #, perl-format
 msgid "%s: arch-specific upload - not including arch-independent packages"
 msgstr ""
 "%s: wydanie specyficzne dla arch - niedo³±czanie pakietów niezale¿nych od "
 "arch"
 
-#: scripts/dpkg-genchanges.pl:138
+#: scripts/dpkg-genchanges.pl:139
 #, fuzzy, perl-format
 msgid "%s: arch-indep upload - not including arch-specific packages"
 msgstr ""
 "%s: wydanie specyficzne dla arch - niedo³±czanie pakietów niezale¿nych od "
 "arch"
 
-#: scripts/dpkg-genchanges.pl:185
+#: scripts/dpkg-genchanges.pl:186
 msgid "cannot read files list file"
 msgstr "nie mo¿na odczytaæ pliku z list± plików"
 
-#: scripts/dpkg-genchanges.pl:189
+#: scripts/dpkg-genchanges.pl:190
 #, perl-format
 msgid "duplicate files list entry for package %s (line %d)"
 msgstr "zduplikowany wpis o pakiecie %s w li¶cie plików (linia %d)"
 
-#: scripts/dpkg-genchanges.pl:197 scripts/dpkg-genchanges.pl:211
+#: scripts/dpkg-genchanges.pl:198 scripts/dpkg-genchanges.pl:212
 #, perl-format
 msgid "duplicate files list entry for file %s (line %d)"
 msgstr "zduplikowany wpis o pliku %s w li¶cie plików (linia %d)"
 
-#: scripts/dpkg-genchanges.pl:217
+#: scripts/dpkg-genchanges.pl:218
 #, perl-format
 msgid "badly formed line in files list file, line %d"
 msgstr "niepoprawna linia w pliku z list± plików w linii %d"
 
-#: scripts/dpkg-genchanges.pl:238 scripts/dpkg-gencontrol.pl:174
-#: scripts/dpkg-source.pl:327
+#: scripts/dpkg-genchanges.pl:239 scripts/dpkg-gencontrol.pl:174
+#: scripts/dpkg-source.pl:328
 msgid "general section of control info file"
 msgstr "sekcja ogólna pliku z informacjami kontrolnymi"
 
-#: scripts/dpkg-genchanges.pl:249
+#: scripts/dpkg-genchanges.pl:250
 #, perl-format
 msgid "package %s in control file but not in files list"
 msgstr "pakiet %s w pliku kontrolnym, ale nie w li¶cie plików"
 
-#: scripts/dpkg-genchanges.pl:292 scripts/dpkg-gencontrol.pl:205
-#: scripts/dpkg-source.pl:367
+#: scripts/dpkg-genchanges.pl:293 scripts/dpkg-gencontrol.pl:205
+#: scripts/dpkg-source.pl:368
 msgid "package's section of control info file"
 msgstr "sekcja pakietu pliku z informacjami kontrolnymi"
 
-#: scripts/dpkg-genchanges.pl:316
+#: scripts/dpkg-genchanges.pl:317
 msgid "read changesdescription"
 msgstr "odczytywanie opisu zmian"
 
-#: scripts/dpkg-genchanges.pl:327
+#: scripts/dpkg-genchanges.pl:328
 #, perl-format
 msgid "package %s listed in files list but not in control info"
 msgstr ""
 "pakiet %s wymieniony w li¶cie plików, ale nie w informacjach kontrolnych"
 
-#: scripts/dpkg-genchanges.pl:339
+#: scripts/dpkg-genchanges.pl:340
 #, perl-format
 msgid "missing Section for binary package %s; using '-'"
 msgstr "brak pola Section pakietu binarnego %s; u¿ywanie '-'"
 
-#: scripts/dpkg-genchanges.pl:341
+#: scripts/dpkg-genchanges.pl:342
 #, perl-format
 msgid "package %s has section %s in control file but %s in files list"
 msgstr "pakiet %s ma w pliku kontrolnym sekcjê %s , a w li¶cie plików - %s"
 
-#: scripts/dpkg-genchanges.pl:348
+#: scripts/dpkg-genchanges.pl:349
 #, perl-format
 msgid "missing Priority for binary package %s; using '-'"
 msgstr "brak pola Priority pakietu binarnego %s; u¿ywanie '-'"
 
-#: scripts/dpkg-genchanges.pl:350
+#: scripts/dpkg-genchanges.pl:351
 #, perl-format
 msgid "package %s has priority %s in control file but %s in files list"
 msgstr "pakiet %s ma priorytet %s w pliku kontrolnym, a %s - w li¶cie plików"
 
-#: scripts/dpkg-genchanges.pl:365
+#: scripts/dpkg-genchanges.pl:366
 msgid "missing Section for source files"
 msgstr "brak pola Section plików ¼ród³owych"
 
-#: scripts/dpkg-genchanges.pl:370
+#: scripts/dpkg-genchanges.pl:371
 msgid "missing Priority for source files"
 msgstr "brak pola Priority plików ¼ród³owych"
 
-#: scripts/dpkg-genchanges.pl:375
+#: scripts/dpkg-genchanges.pl:376
 #, fuzzy, perl-format
 msgid "cannot open .dsc file %s"
 msgstr "nie mo¿na otworzyæ pliku .dsc %s: %s"
 
-#: scripts/dpkg-genchanges.pl:378 scripts/dpkg-source.pl:824
+#: scripts/dpkg-genchanges.pl:379 scripts/dpkg-source.pl:833
 #, perl-format
 msgid "source control file %s"
 msgstr "¼ród³owy plik kontrolny %s"
 
-#: scripts/dpkg-genchanges.pl:384 scripts/dpkg-source.pl:863
+#: scripts/dpkg-genchanges.pl:385 scripts/dpkg-source.pl:872
 #, perl-format
 msgid "Files field contains bad line `%s'"
 msgstr "Pole Files zawiera niepoprawn± liniê `%s'"
 
-#: scripts/dpkg-genchanges.pl:396
+#: scripts/dpkg-genchanges.pl:397
 msgid "not including original source code in upload"
 msgstr "niedo³±czanie oryginalnych kodów ¼ród³owych do wydania"
 
-#: scripts/dpkg-genchanges.pl:401
+#: scripts/dpkg-genchanges.pl:402
 msgid "ignoring -sd option for native Debian package"
 msgstr "natywny pakiet Debiana - ignorowanie opcji -sd "
 
-#: scripts/dpkg-genchanges.pl:403
+#: scripts/dpkg-genchanges.pl:404
 msgid "including full source code in upload"
 msgstr "do³±czanie pe³nych kodów ¼ród³owych do wydania"
 
-#: scripts/dpkg-genchanges.pl:406
+#: scripts/dpkg-genchanges.pl:407
 msgid "binary-only upload - not including any source code"
 msgstr "wydanie tylko binarne - niedo³±czanie ¿adnych kodów ¼ród³owych"
 
-#: scripts/dpkg-genchanges.pl:410
+#: scripts/dpkg-genchanges.pl:411
 msgid "write original source message"
 msgstr "wypisywanie oryginalnego komunikatu ¼ród³owego"
 
-#: scripts/dpkg-genchanges.pl:440
+#: scripts/dpkg-genchanges.pl:441
 #, perl-format
 msgid "cannot open upload file %s for reading"
 msgstr "nie mo¿na otworzyæ do odczytu pliku wydania %s"
 
-#: scripts/dpkg-genchanges.pl:441
+#: scripts/dpkg-genchanges.pl:442
 #, perl-format
 msgid "cannot fstat upload file %s"
 msgstr "nie mo¿na wykonaæ fstat na pliku wydania %s"
 
-#: scripts/dpkg-genchanges.pl:443
+#: scripts/dpkg-genchanges.pl:444
 #, perl-format
 msgid "upload file %s is empty"
 msgstr "plik wydania %s jest pusty"
 
-#: scripts/dpkg-genchanges.pl:445
+#: scripts/dpkg-genchanges.pl:446
 #, perl-format
 msgid "md5sum upload file %s"
 msgstr "md5sum pliku wydania %s"
 
-#: scripts/dpkg-genchanges.pl:447
+#: scripts/dpkg-genchanges.pl:448
 #, perl-format
 msgid "md5sum upload file %s gave strange output `%s'"
 msgstr "md5sum na pliku wydania %s wypisa³o dziwny komunikat `%s'"
 
-#: scripts/dpkg-genchanges.pl:451
+#: scripts/dpkg-genchanges.pl:452
 #, perl-format
 msgid "md5sum of source file %s (%s) is different from md5sum in %s (%s)"
 msgstr "suma m5d pliku ¼ród³owego %s (%s) ró¿ni siê od sumy md5 w %s (%s)"
 
-#: scripts/dpkg-genchanges.pl:466 scripts/dpkg-source.pl:396
+#: scripts/dpkg-genchanges.pl:467 scripts/dpkg-source.pl:397
 #, perl-format
 msgid "missing information for critical output field %s"
 msgstr "brak informacji o krytycznym polu wyj¶ciowym %s"
 
-#: scripts/dpkg-genchanges.pl:471 scripts/dpkg-gencontrol.pl:278
-#: scripts/dpkg-gencontrol.pl:281 scripts/dpkg-source.pl:400
+#: scripts/dpkg-genchanges.pl:472 scripts/dpkg-gencontrol.pl:278
+#: scripts/dpkg-gencontrol.pl:281 scripts/dpkg-source.pl:401
 #, perl-format
 msgid "missing information for output field %s"
 msgstr "brak informacji o polu wyj¶ciowym %s"
@@ -947,7 +947,7 @@ msgstr ""
 "bie¿±ca architektura go¶cia %s nie jest wymieniona w li¶cie architektur "
 "pakietu (%s)"
 
-#: scripts/dpkg-gencontrol.pl:224 scripts/dpkg-source.pl:384
+#: scripts/dpkg-gencontrol.pl:224 scripts/dpkg-source.pl:385
 #, perl-format
 msgid "value from nowhere, with key >%s< and value >%s<"
 msgstr "warto¶æ znik±d, z kluczem >%s< i warto¶ci± >%s<"
@@ -1496,7 +1496,7 @@ msgstr "nierozpoznane pole zale
 msgid "need at least one executable"
 msgstr "wymaga co najmniej jednego argumentu bêd±cego plikiem wykonywalnym"
 
-#: scripts/dpkg-shlibdeps.pl:115
+#: scripts/dpkg-shlibdeps.pl:116
 #, perl-format
 msgid ""
 "couldn't find library %s needed by %s (its RPATH is '%s').\n"
@@ -1506,49 +1506,49 @@ msgid ""
 "LD_LIBRARY_PATH."
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:198
+#: scripts/dpkg-shlibdeps.pl:200
 #, fuzzy, perl-format
 msgid "no dependency information found for %s (used by %s)."
 msgstr ""
 "Nie znaleziono ¿adnych informacji o zale¿no¶ciach dla %s (u¿ywanego przez %"
 "s)."
 
-#: scripts/dpkg-shlibdeps.pl:238
+#: scripts/dpkg-shlibdeps.pl:240
 #, perl-format
 msgid "symbol %s used by %s found in none of the libraries."
 msgstr "w ¿adnej z bibliotek nie znaleziono symbolu %s u¿ywanego przez %s."
 
-#: scripts/dpkg-shlibdeps.pl:251
+#: scripts/dpkg-shlibdeps.pl:253
 #, perl-format
 msgid "%d other similar warnings have been skipped (use -v to see them all)."
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:271
+#: scripts/dpkg-shlibdeps.pl:273
 #, perl-format
 msgid "%s shouldn't be linked with %s (it uses none of its symbols)."
 msgstr "%s nie powinien byæ linkowany z %s (nie u¿ywa ¿adnego z jego symboli)."
 
-#: scripts/dpkg-shlibdeps.pl:283
+#: scripts/dpkg-shlibdeps.pl:285
 #, perl-format
 msgid "open new substvars file `%s'"
 msgstr "otwieranie nowego pliku podstawieñ `%s'"
 
-#: scripts/dpkg-shlibdeps.pl:286
+#: scripts/dpkg-shlibdeps.pl:288
 #, perl-format
 msgid "open old varlist file `%s' for reading"
 msgstr "otwieranie do odczytu pliku listy zmiennych `%s'"
 
-#: scripts/dpkg-shlibdeps.pl:289
+#: scripts/dpkg-shlibdeps.pl:291
 #, perl-format
 msgid "copy old entry to new varlist file `%s'"
 msgstr "kopiowanie starego wpisu do nowego pliku z list± zmiennych `%s'"
 
-#: scripts/dpkg-shlibdeps.pl:349
+#: scripts/dpkg-shlibdeps.pl:351
 #, perl-format
 msgid "install new varlist file `%s'"
 msgstr "instalowanie nowego pliku z list± zmiennych `%s'"
 
-#: scripts/dpkg-shlibdeps.pl:359
+#: scripts/dpkg-shlibdeps.pl:361
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson.\n"
@@ -1562,7 +1562,7 @@ msgstr ""
 "Copyright (C) 2006 Frank Lichtenheld.\n"
 "Copyright (C) 2007 Raphael Hertzog.\n"
 
-#: scripts/dpkg-shlibdeps.pl:374
+#: scripts/dpkg-shlibdeps.pl:376
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <executable>|-e<executable> [<option> ...]\n"
@@ -1609,28 +1609,28 @@ msgstr ""
 "Rozpoznawane pola zale¿no¶ci s± nastêpuj±ce:\n"
 "  %s\n"
 
-#: scripts/dpkg-shlibdeps.pl:481
+#: scripts/dpkg-shlibdeps.pl:485
 #, perl-format
 msgid "Can't extract name and version from library name `%s'"
 msgstr "Nie mo¿na wydobyæ nazwy i wersji z nazwy pliku biblioteki `%s'"
 
-#: scripts/dpkg-shlibdeps.pl:488
+#: scripts/dpkg-shlibdeps.pl:492
 #, perl-format
 msgid "unable to open shared libs info file `%s'"
 msgstr ""
 "nie mo¿na otworzyæ pliku informacji o bibliotekach wspó³dzielonych `%s'"
 
-#: scripts/dpkg-shlibdeps.pl:494
+#: scripts/dpkg-shlibdeps.pl:498
 #, perl-format
 msgid "shared libs info file `%s' line %d: bad line `%s'"
 msgstr "plik bibliotek wspó³dzielonych %s, linia %d: niepoprawna linia `%s'"
 
-#: scripts/dpkg-shlibdeps.pl:535
+#: scripts/dpkg-shlibdeps.pl:539
 #, perl-format
 msgid "cannot open file %s"
 msgstr "nie mo¿na otworzyæ pliku %s"
 
-#: scripts/dpkg-shlibdeps.pl:568
+#: scripts/dpkg-shlibdeps.pl:572
 #, perl-format
 msgid ""
 "$ORIGIN is used in RPATH of %s and the corresponding directory could not be "
@@ -1638,28 +1638,28 @@ msgid ""
 "build tree"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl:615
+#: scripts/dpkg-shlibdeps.pl:619
 msgid "cannot fork for dpkg --search"
 msgstr "b³±d fork dla dpkg --search"
 
-#: scripts/dpkg-shlibdeps.pl:622
+#: scripts/dpkg-shlibdeps.pl:626
 msgid "cannot exec dpkg"
 msgstr "uruchamianie dpkg  nie powiod³o siê"
 
-#: scripts/dpkg-shlibdeps.pl:627
+#: scripts/dpkg-shlibdeps.pl:631
 msgid "diversions involved - output may be incorrect"
 msgstr "nadpisania u¿yte - wyj¶cie mo¿e byæ niepoprawne"
 
-#: scripts/dpkg-shlibdeps.pl:629
+#: scripts/dpkg-shlibdeps.pl:633
 msgid "write diversion info to stderr"
 msgstr "wypisywanie informacji o ominiêciach na stderr"
 
-#: scripts/dpkg-shlibdeps.pl:633
+#: scripts/dpkg-shlibdeps.pl:637
 #, perl-format
 msgid "unknown output from dpkg --search: '%s'"
 msgstr "nierozpoznane wyj¶cie z dpkg --search: '%s'"
 
-#: scripts/dpkg-source.pl:140
+#: scripts/dpkg-source.pl:141
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson and Klee Dienes."
@@ -1667,7 +1667,7 @@ msgstr ""
 "\n"
 "Copyright (C) 1996 Ian Jackson and Klee Dienes."
 
-#: scripts/dpkg-source.pl:151
+#: scripts/dpkg-source.pl:152
 #, fuzzy, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -1764,69 +1764,79 @@ msgstr ""
 "  -h, --help               wy¶wietla ten komunikat pomocy.\n"
 "  --version                wy¶wietla informacje o wersji programu.\n"
 
-#: scripts/dpkg-source.pl:220
+#: scripts/dpkg-source.pl:221
 #, perl-format
 msgid "%s is not a supported compression"
 msgstr "%s nie jest obs³ugiwanym typem kompresji"
 
-#: scripts/dpkg-source.pl:224
+#: scripts/dpkg-source.pl:225
 #, perl-format
 msgid "%s is not a compression level"
 msgstr " %s nie jest poziomem kompresji"
 
-#: scripts/dpkg-source.pl:227
+#: scripts/dpkg-source.pl:228
 #, perl-format
 msgid "-s%s option overrides earlier -s%s option"
 msgstr "opcja -s%s nadpisuje wcze¶niejsz± opcjê -s%s"
 
-#: scripts/dpkg-source.pl:272
+#: scripts/dpkg-source.pl:273
 msgid "need -x or -b"
 msgstr "potrzeba -x lub -b"
 
-#: scripts/dpkg-source.pl:280
+#: scripts/dpkg-source.pl:281
 #, perl-format
 msgid "source handling style -s%s not allowed with -b"
 msgstr "nie mo¿na ³±czyæ -s%s, odnosz±cej siê do obs³ugi ¼róde³, z -b"
 
-#: scripts/dpkg-source.pl:283
+#: scripts/dpkg-source.pl:284
 msgid "-b needs a directory"
 msgstr "-b wymaga podania katalogu"
 
-#: scripts/dpkg-source.pl:284
+#: scripts/dpkg-source.pl:285
 msgid "-b takes at most a directory and an orig source argument"
 msgstr "-b pobiera co najwy¿ej dwa argumenty: katalog i oryginalne ¼ród³a"
 
-#: scripts/dpkg-source.pl:287
+#: scripts/dpkg-source.pl:288
 #, perl-format
 msgid "cannot stat directory %s: %s"
 msgstr "nie mo¿na wykonaæ stat na katalogu %s: %s"
 
-#: scripts/dpkg-source.pl:288
+#: scripts/dpkg-source.pl:289
 #, perl-format
 msgid "directory argument %s is not a directory"
 msgstr "argument %s nie jest katalogiem"
 
-#: scripts/dpkg-source.pl:346
+#: scripts/dpkg-source.pl:347
 #, perl-format
 msgid "`%s' is not a legal architecture string"
 msgstr "`%s' nie jest poprawn± specyfikacj± architektury"
 
-#: scripts/dpkg-source.pl:349
+#: scripts/dpkg-source.pl:350
 #, perl-format
 msgid "architecture %s only allowed on its own (list for package %s is `%s')"
 msgstr ""
 "architektura %s dopuszczalna tylko sama (list± dla pakietu %s jest `%s')"
 
-#: scripts/dpkg-source.pl:402
+#: scripts/dpkg-source.pl:403
 msgid "unable to determine source package name !"
 msgstr "nie mo¿na okre¶liæ nazwy pakietu ¼ród³owego"
 
-#: scripts/dpkg-source.pl:423
+#: scripts/dpkg-source.pl:424
+#, perl-format
+msgid "packed orig `%s' exists but is not a plain file"
+msgstr "spakowany oryg. `%s' istnieje, ale nie jest zwyk³ym plikiem"
+
+#: scripts/dpkg-source.pl:429
+#, perl-format
+msgid "unable to stat putative packed orig `%s'"
+msgstr "nie mo¿na zbadaæ stanu domniemanego spakowanego oryginalnego `%s'"
+
+#: scripts/dpkg-source.pl:439
 #, perl-format
 msgid "cannot stat orig argument %s: %s"
 msgstr "nie mo¿na wykonaæ stat na oryginalnym argumencie %s: %s"
 
-#: scripts/dpkg-source.pl:429
+#: scripts/dpkg-source.pl:445
 #, perl-format
 msgid ""
 "orig argument is unpacked but source handling style -s%s calls for packed (."
@@ -1835,7 +1845,7 @@ msgstr ""
 "argument orig jest niespakowany, ale opcja przetwarzania ¼róde³ -s%s "
 "oczekuje spakowanego (.orig.tar.<rozszerzenie>)"
 
-#: scripts/dpkg-source.pl:436
+#: scripts/dpkg-source.pl:452
 #, perl-format
 msgid ""
 "orig argument is packed but source handling style -s%s calls for unpacked (."
@@ -1844,7 +1854,7 @@ msgstr ""
 "argument orig jest spakowany, ale opcja przetwarzania ¼róde³ -s%s oczekuje "
 "niespakowanego (.orig/)"
 
-#: scripts/dpkg-source.pl:445
+#: scripts/dpkg-source.pl:461
 #, perl-format
 msgid ""
 "orig argument is empty (means no orig, no diff) but source handling style -s%"
@@ -1853,39 +1863,29 @@ msgstr ""
 "argument orig jest pusty (brak orig i ró¿nic), ale opcja przetwarzania "
 "¼róde³ -s%s oczekuje jakiego¶"
 
-#: scripts/dpkg-source.pl:453
-#, perl-format
-msgid "packed orig `%s' exists but is not a plain file"
-msgstr "spakowany oryg. `%s' istnieje, ale nie jest zwyk³ym plikiem"
-
-#: scripts/dpkg-source.pl:459
-#, perl-format
-msgid "unable to stat putative packed orig `%s'"
-msgstr "nie mo¿na zbadaæ stanu domniemanego spakowanego oryginalnego `%s'"
-
-#: scripts/dpkg-source.pl:464
+#: scripts/dpkg-source.pl:473
 #, perl-format
 msgid "unpacked orig `%s' exists but is not a directory"
 msgstr "rozpakowany oryg. '%s' istnieje, ale nie jest katalogiem"
 
-#: scripts/dpkg-source.pl:468
+#: scripts/dpkg-source.pl:477
 #, perl-format
 msgid "unable to stat putative unpacked orig `%s'"
 msgstr "nie mo¿na zbadaæ stanu domniemanego rozpakowanego oryginalnego `%s'"
 
-#: scripts/dpkg-source.pl:480
+#: scripts/dpkg-source.pl:489
 #, perl-format
 msgid "source directory '%s' is not <sourcepackage>-<upstreamversion> '%s'"
 msgstr "katalog ¼ród³owy '%s'  nie jest w postaci <pakiet_¼ród³owy> '%s'"
 
-#: scripts/dpkg-source.pl:494
+#: scripts/dpkg-source.pl:503
 #, perl-format
 msgid ".orig directory name %s is not <package>-<upstreamversion> (wanted %s)"
 msgstr ""
 "nazwa katalogu .orig %s nie jest w postaci <pakiet>-<wersja_g³ówna> "
 "(oczekiwano %s)"
 
-#: scripts/dpkg-source.pl:503
+#: scripts/dpkg-source.pl:512
 #, perl-format
 msgid ""
 ".orig.tar name %s is not <package>_<upstreamversion>.orig.tar (wanted %s)"
@@ -1893,7 +1893,7 @@ msgstr ""
 "nazwa pliku .orig.tar %s nie jest w postaci <pakiet>-<wersja_g³ówna>.orig."
 "tar. (oczekiwano %s)"
 
-#: scripts/dpkg-source.pl:516
+#: scripts/dpkg-source.pl:525
 #, perl-format
 msgid ""
 "tarfile `%s' already exists, not overwriting, giving up; use -sU or -sR to "
@@ -1902,62 +1902,62 @@ msgstr ""
 "archiwum tar `%s' ju¿ istnieje, nie bêdzie nadpisany, poddawanie siê , u¿yj -"
 "sU lub -sR, aby nadpisaæ"
 
-#: scripts/dpkg-source.pl:519
+#: scripts/dpkg-source.pl:528
 #, perl-format
 msgid "unable to check for existence of `%s'"
 msgstr "nie mo¿na sprawdziæ istnienia `%s'"
 
-#: scripts/dpkg-source.pl:522 scripts/dpkg-source.pl:592
-#: scripts/dpkg-source.pl:752
+#: scripts/dpkg-source.pl:531 scripts/dpkg-source.pl:601
+#: scripts/dpkg-source.pl:761
 #, perl-format
 msgid "%s: building %s in %s"
 msgstr "%s: budowanie %s w %s"
 
-#: scripts/dpkg-source.pl:524
+#: scripts/dpkg-source.pl:533
 msgid "write building tar message"
 msgstr "wypisywanie komunikatu o  budowaniu archiwum tar"
 
-#: scripts/dpkg-source.pl:528
+#: scripts/dpkg-source.pl:537
 msgid "fork for tar"
 msgstr "fork dla tar"
 
-#: scripts/dpkg-source.pl:531
+#: scripts/dpkg-source.pl:540
 #, perl-format
 msgid "chdir to above (orig) source %s"
 msgstr "zmiana katalogu na nadrzêdny w stosunku do (oryg.) ¼ród³a: %s"
 
-#: scripts/dpkg-source.pl:532
+#: scripts/dpkg-source.pl:541
 msgid "reopen gzip for tar"
 msgstr "ponowne otwieranie gzip dla tar"
 
-#: scripts/dpkg-source.pl:534
+#: scripts/dpkg-source.pl:543
 msgid "exec tar"
 msgstr "uruchamianie tar"
 
-#: scripts/dpkg-source.pl:538
+#: scripts/dpkg-source.pl:547
 msgid "wait for tar"
 msgstr "czekanie na tar"
 
-#: scripts/dpkg-source.pl:541 scripts/dpkg-source.pl:713
+#: scripts/dpkg-source.pl:550 scripts/dpkg-source.pl:722
 #, perl-format
 msgid "unable to rename `%s' (newly created) to `%s'"
 msgstr "nie mo¿na zmieniæ nazwy (nowo utworzonego) `%s' na `%s'"
 
-#: scripts/dpkg-source.pl:544 scripts/dpkg-source.pl:716
+#: scripts/dpkg-source.pl:553 scripts/dpkg-source.pl:725
 #, perl-format
 msgid "unable to change permission of `%s'"
 msgstr "nie mo¿na zmieniæ praw dostêpu `%s'"
 
-#: scripts/dpkg-source.pl:548
+#: scripts/dpkg-source.pl:557
 #, perl-format
 msgid "%s: building %s using existing %s"
 msgstr "%s: budowanie %s, u¿ywaj±c istniej±cego %s"
 
-#: scripts/dpkg-source.pl:550
+#: scripts/dpkg-source.pl:559
 msgid "write using existing tar message"
 msgstr "wypisywanie komunikatu o u¿ywaniu istniej±cego archiwum tar"
 
-#: scripts/dpkg-source.pl:560
+#: scripts/dpkg-source.pl:569
 #, perl-format
 msgid ""
 "orig dir `%s' already exists, not overwriting, giving up; use -sA, -sK or -"
@@ -1966,491 +1966,491 @@ msgstr ""
 "oryg. katalog `%s' ju¿ istnieje, nie bêdzie nadpisany, poddawanie siê; u¿yj -"
 "sA, -sK lub -sP, aby nadpisaæ"
 
-#: scripts/dpkg-source.pl:567
+#: scripts/dpkg-source.pl:576
 #, perl-format
 msgid "unable to check for existence of orig dir `%s'"
 msgstr "nie mo¿na sprawdziæ istnienia katalogu orig `%s'"
 
-#: scripts/dpkg-source.pl:577 scripts/dpkg-source.pl:938
+#: scripts/dpkg-source.pl:586 scripts/dpkg-source.pl:947
 #, perl-format
 msgid "unable to create `%s'"
 msgstr "nie mo¿na utworzyæ `%s'"
 
-#: scripts/dpkg-source.pl:581 scripts/dpkg-source.pl:919
-#: scripts/dpkg-source.pl:942
+#: scripts/dpkg-source.pl:590 scripts/dpkg-source.pl:928
+#: scripts/dpkg-source.pl:951
 #, perl-format
 msgid "unable to rename `%s' to `%s'"
 msgstr "nie mo¿na zmieniæ nazwy `%s' na `%s'"
 
-#: scripts/dpkg-source.pl:585 scripts/dpkg-source.pl:944
+#: scripts/dpkg-source.pl:594 scripts/dpkg-source.pl:953
 #, perl-format
 msgid "unable to remove `%s'"
 msgstr "nie mo¿na usun±æ `%s'"
 
-#: scripts/dpkg-source.pl:594
+#: scripts/dpkg-source.pl:603
 msgid "write building diff message"
 msgstr "wypisywanie komunikatu o budowaniu pliku ró¼nic"
 
-#: scripts/dpkg-source.pl:599
+#: scripts/dpkg-source.pl:608
 msgid "fork for find"
 msgstr "fork dla find"
 
-#: scripts/dpkg-source.pl:601
+#: scripts/dpkg-source.pl:610
 #, perl-format
 msgid "chdir to %s for find"
 msgstr "zmiana katalogu na `%s' dla find"
 
-#: scripts/dpkg-source.pl:602
+#: scripts/dpkg-source.pl:611
 msgid "exec find"
 msgstr "uruchamianie find"
 
-#: scripts/dpkg-source.pl:611
+#: scripts/dpkg-source.pl:620
 #, perl-format
 msgid "cannot stat file %s"
 msgstr "nie mo¿na wykonaæ stat na pliku %s"
 
-#: scripts/dpkg-source.pl:618
+#: scripts/dpkg-source.pl:627
 #, perl-format
 msgid "cannot read link %s"
 msgstr "nie mo¿na odczytaæ dowi±zania %s"
 
-#: scripts/dpkg-source.pl:620
+#: scripts/dpkg-source.pl:629
 #, perl-format
 msgid "cannot read orig link %s"
 msgstr "nie mo¿na odczytaæ oryginalnego dowi±zania %s"
 
-#: scripts/dpkg-source.pl:621 scripts/dpkg-source.pl:622
+#: scripts/dpkg-source.pl:630 scripts/dpkg-source.pl:631
 #, perl-format
 msgid "symlink to %s"
 msgstr "dowi±zanie symboliczne do %s"
 
-#: scripts/dpkg-source.pl:629 scripts/dpkg-source.pl:700
+#: scripts/dpkg-source.pl:638 scripts/dpkg-source.pl:709
 #, perl-format
 msgid "cannot stat orig file %s"
 msgstr "nie mo¿na wykonaæ stat na oryginalnym  pliku %s"
 
-#: scripts/dpkg-source.pl:632
+#: scripts/dpkg-source.pl:641
 #, perl-format
 msgid "newly created empty file '%s' will not be represented in diff"
 msgstr "nowo utworzony pusty plik '%s' nie bêdzie do³±czony do pliku ró¿nic"
 
-#: scripts/dpkg-source.pl:636
+#: scripts/dpkg-source.pl:645
 #, perl-format
 msgid "executable mode %04o of '%s' will not be represented in diff"
 msgstr ""
 "prawa dostêpu %04o wykonywalnego pliku '%s' nie bêd± do³±czone do pliku "
 "ró¿nic"
 
-#: scripts/dpkg-source.pl:641
+#: scripts/dpkg-source.pl:650
 #, perl-format
 msgid "special mode %04o of '%s' will not be represented in diff"
 msgstr ""
 "specjalne prawa dostêpu %04o pliku '%s' nie bêd± do³±czone do pliku ró¿nic"
 
-#: scripts/dpkg-source.pl:648 scripts/dpkg-source.pl:1523
+#: scripts/dpkg-source.pl:657 scripts/dpkg-source.pl:1532
 msgid "something else"
 msgstr "co¶ innego"
 
-#: scripts/dpkg-source.pl:649
+#: scripts/dpkg-source.pl:658
 msgid "plain file"
 msgstr "zwyk³y plik"
 
-#: scripts/dpkg-source.pl:652
+#: scripts/dpkg-source.pl:661
 msgid "fork for diff"
 msgstr "fork dla diff"
 
-#: scripts/dpkg-source.pl:661
+#: scripts/dpkg-source.pl:670
 msgid "exec diff"
 msgstr "uruchamianie diff"
 
-#: scripts/dpkg-source.pl:668
+#: scripts/dpkg-source.pl:677
 msgid "binary file contents changed"
 msgstr "zawarto¶æ pliku binarnego zmieni³a siê"
 
-#: scripts/dpkg-source.pl:673
+#: scripts/dpkg-source.pl:682
 #, perl-format
 msgid "file %s has no final newline (either original or modified version)"
 msgstr ""
 "plik %s nie koñczy siê znakiem nowej linii (albo oryginalny, albo "
 "zmodyfikowany)"
 
-#: scripts/dpkg-source.pl:677
+#: scripts/dpkg-source.pl:686
 #, perl-format
 msgid "unknown line from diff -u on %s: `%s'"
 msgstr "nieznana linia z diff -u w %s: `%s'"
 
-#: scripts/dpkg-source.pl:680
+#: scripts/dpkg-source.pl:689
 msgid "failed to write to compression pipe"
 msgstr "nie mo¿na zapisaæ do potoku kompresji"
 
-#: scripts/dpkg-source.pl:686
+#: scripts/dpkg-source.pl:695
 msgid "diff gave 1 but no diff lines found"
 msgstr "diff zwróci³ 1, ale nie znaleziono ¿adnej linii ró¿nic"
 
-#: scripts/dpkg-source.pl:689
+#: scripts/dpkg-source.pl:698
 #, perl-format
 msgid "diff on %s"
 msgstr "diff na %s"
 
-#: scripts/dpkg-source.pl:695
+#: scripts/dpkg-source.pl:704
 msgid "device or socket is not allowed"
 msgstr "urz±dzenie lub gniazdo nie s± dozwolone"
 
-#: scripts/dpkg-source.pl:702
+#: scripts/dpkg-source.pl:711
 msgid "not a directory"
 msgstr "nie jest katalogiem"
 
-#: scripts/dpkg-source.pl:703
+#: scripts/dpkg-source.pl:712
 msgid "directory"
 msgstr "katalog"
 
-#: scripts/dpkg-source.pl:706
+#: scripts/dpkg-source.pl:715
 #, perl-format
 msgid "unknown file type (%s)"
 msgstr "nieznany typ pliku (%s)"
 
-#: scripts/dpkg-source.pl:710
+#: scripts/dpkg-source.pl:719
 msgid "finish write to compression pipe"
 msgstr "nie mo¿na zapisaæ potoku do potoku kompresji"
 
-#: scripts/dpkg-source.pl:718
+#: scripts/dpkg-source.pl:727
 msgid "fork for 2nd find"
 msgstr "niepowodzenie fork dla drugiego polecenia find"
 
-#: scripts/dpkg-source.pl:720
+#: scripts/dpkg-source.pl:729
 #, perl-format
 msgid "chdir to %s for 2nd find"
 msgstr "zmiana katalogu na %s dla drugiego find"
 
-#: scripts/dpkg-source.pl:721
+#: scripts/dpkg-source.pl:730
 msgid "exec 2nd find"
 msgstr "uruchamianie drugiego find"
 
-#: scripts/dpkg-source.pl:730
+#: scripts/dpkg-source.pl:739
 #, perl-format
 msgid "cannot check orig file %s"
 msgstr "nie mo¿na sprawdziæ oryginalnego  pliku %s"
 
-#: scripts/dpkg-source.pl:732
+#: scripts/dpkg-source.pl:741
 #, perl-format
 msgid "ignoring deletion of file %s"
 msgstr "zignorowano usuniêcie pliku %s"
 
-#: scripts/dpkg-source.pl:734
+#: scripts/dpkg-source.pl:743
 #, perl-format
 msgid "ignoring deletion of directory %s"
 msgstr "zignorowano usuniêcie katalogu %s"
 
-#: scripts/dpkg-source.pl:736
+#: scripts/dpkg-source.pl:745
 #, perl-format
 msgid "ignoring deletion of symlink %s"
 msgstr "zignorowano usuniêcie dowi±zania symbolicznego %s"
 
-#: scripts/dpkg-source.pl:738
+#: scripts/dpkg-source.pl:747
 msgid "not a file, directory or link"
 msgstr "nie jest plikiem, katalogiem ani dowi±zaniem"
 
-#: scripts/dpkg-source.pl:739 scripts/dpkg-source.pl:1518
+#: scripts/dpkg-source.pl:748 scripts/dpkg-source.pl:1527
 msgid "nonexistent"
 msgstr "nieistniej±ce"
 
-#: scripts/dpkg-source.pl:754
+#: scripts/dpkg-source.pl:763
 msgid "write building message"
 msgstr "wypisywanie komunikatu o budowaniu"
 
-#: scripts/dpkg-source.pl:756
+#: scripts/dpkg-source.pl:765
 #, perl-format
 msgid "create %s"
 msgstr "tworzenie %s"
 
-#: scripts/dpkg-source.pl:762
+#: scripts/dpkg-source.pl:771
 #, perl-format
 msgid "%s: unrepresentable changes to source"
 msgstr "%s: niereprezentowalne zmiany w ¼ródle"
 
-#: scripts/dpkg-source.pl:763
+#: scripts/dpkg-source.pl:772
 #, perl-format
 msgid "write error msg: %s"
 msgstr "zapisywanie kom. b³êdu: %s"
 
-#: scripts/dpkg-source.pl:772
+#: scripts/dpkg-source.pl:781
 #, perl-format
 msgid "source handling style -s%s not allowed with -x"
 msgstr "opcja przetwarzania ¼róde³ -s%s nie jest dopuszczalna z -x"
 
-#: scripts/dpkg-source.pl:775
+#: scripts/dpkg-source.pl:784
 msgid "-x needs at least one argument, the .dsc"
 msgstr "-x wymaga co najmniej jednego argumentu, .dsc"
 
-#: scripts/dpkg-source.pl:776
+#: scripts/dpkg-source.pl:785
 msgid "-x takes no more than two arguments"
 msgstr "-x pobiera nie wiêcej ni¿ dwa argumenty"
 
-#: scripts/dpkg-source.pl:780
+#: scripts/dpkg-source.pl:789
 msgid "-x needs the .dsc file as first argument, not a directory"
 msgstr "-x wymaga pliku .dsc, a nie katalogu, jako pierwszego argumentu"
 
-#: scripts/dpkg-source.pl:788
+#: scripts/dpkg-source.pl:797
 #, perl-format
 msgid "unpack target exists: %s"
 msgstr "cel rozpakowania istnieje: %s"
 
-#: scripts/dpkg-source.pl:792 scripts/dpkg-source.pl:823
+#: scripts/dpkg-source.pl:801 scripts/dpkg-source.pl:832
 #, perl-format
 msgid "cannot open .dsc file %s: %s"
 msgstr "nie mo¿na otworzyæ pliku .dsc %s: %s"
 
-#: scripts/dpkg-source.pl:812
+#: scripts/dpkg-source.pl:821
 #, perl-format
 msgid "failed to verify signature on %s"
 msgstr "b³±d weryfikowania sygnatury w %s"
 
-#: scripts/dpkg-source.pl:816
+#: scripts/dpkg-source.pl:825
 #, perl-format
 msgid "could not verify signature on %s since gpg isn't installed"
 msgstr "nie mo¿na zweryfikowaæ sygnatury w %s, poniewa¿ nie zainstalowano gpg"
 
-#: scripts/dpkg-source.pl:820
+#: scripts/dpkg-source.pl:829
 #, perl-format
 msgid "extracting unsigned source package (%s)"
 msgstr "wydobywanie niepodpisanych pakietów ¼ród³owych (%s)"
 
-#: scripts/dpkg-source.pl:829
+#: scripts/dpkg-source.pl:838
 #, perl-format
 msgid "missing critical source control field %s"
 msgstr "brak krytycznego ¼ród³owego pola kontrolnego %s "
 
-#: scripts/dpkg-source.pl:835
+#: scripts/dpkg-source.pl:844
 #, perl-format
 msgid "Unsupported format of .dsc file (%s)"
 msgstr "Nieobs³ugiwany format pliku .dsc (%s)"
 
-#: scripts/dpkg-source.pl:867
+#: scripts/dpkg-source.pl:876
 #, perl-format
 msgid "Files field contains invalid filename `%s'"
 msgstr "Pole Files zawiera niepoprawn± nazwê pliku `%s'"
 
-#: scripts/dpkg-source.pl:872
+#: scripts/dpkg-source.pl:881
 #, perl-format
 msgid "repeated file type - files `%s' and `%s'"
 msgstr "powtórzony typ pliku - pliki `%s' i `%s'"
 
-#: scripts/dpkg-source.pl:886
+#: scripts/dpkg-source.pl:895
 #, perl-format
 msgid "unrecognised file type - `%s'"
 msgstr "nieznany typ pliku - `%s'"
 
-#: scripts/dpkg-source.pl:890
+#: scripts/dpkg-source.pl:899
 msgid "no tarfile in Files field"
 msgstr "pole Files nie zawiera nazwy archiwum tar"
 
-#: scripts/dpkg-source.pl:893
+#: scripts/dpkg-source.pl:902
 msgid "multiple tarfiles in native package"
 msgstr "wiele archiwów tar w natywnym pakiecie"
 
-#: scripts/dpkg-source.pl:894
+#: scripts/dpkg-source.pl:903
 msgid "native package with .orig.tar"
 msgstr "pakiet natywny z rozszerzeniem .orig.tar"
 
-#: scripts/dpkg-source.pl:897
+#: scripts/dpkg-source.pl:906
 msgid "no upstream tarfile in Files field"
 msgstr "nie znaleziono ¿adnego archiwum tar w pliku Files"
 
-#: scripts/dpkg-source.pl:900
+#: scripts/dpkg-source.pl:909
 #, perl-format
 msgid "multiple upstream tarballs in %s format dsc"
 msgstr "wiele ¼ród³owych archiwów tar w wersji %s formatu dsc"
 
-#: scripts/dpkg-source.pl:902
+#: scripts/dpkg-source.pl:911
 #, perl-format
 msgid "debian.tar in %s format dsc"
 msgstr "debian.tar w %s formacie dsc"
 
-#: scripts/dpkg-source.pl:912
+#: scripts/dpkg-source.pl:921
 #, perl-format
 msgid "%s: extracting %s in %s"
 msgstr "%s: rozpakowywanie%s w %s"
 
-#: scripts/dpkg-source.pl:914
+#: scripts/dpkg-source.pl:923
 msgid "write extracting message"
 msgstr "wypisywanie informacji o rozpakowywaniu"
 
-#: scripts/dpkg-source.pl:939
+#: scripts/dpkg-source.pl:948
 #, perl-format
 msgid "%s: unpacking %s"
 msgstr "%s: rozpakowywanie %s"
 
-#: scripts/dpkg-source.pl:952
+#: scripts/dpkg-source.pl:961
 #, perl-format
 msgid "failed to stat `%s' to see if need to copy"
 msgstr "b³±d podczas stat `%s', w celu sprawdzenia, czy nale¿y go skopiowaæ"
 
-#: scripts/dpkg-source.pl:964
+#: scripts/dpkg-source.pl:973
 #, perl-format
 msgid "failed to check destination `%s' to see if need to copy"
 msgstr "b³±d sprawdzania docelowego `%s', aby okre¶liæ, czy nale¿y kopiowaæ"
 
-#: scripts/dpkg-source.pl:977
+#: scripts/dpkg-source.pl:986
 msgid "unable to keep orig directory (already exists)"
 msgstr "nie mo¿na otworzyæ zachowaæ oryginalnego katalogu (ju¿ istnieje)"
 
-#: scripts/dpkg-source.pl:1011 scripts/dpkg-source.pl:1071
+#: scripts/dpkg-source.pl:1020 scripts/dpkg-source.pl:1080
 #, perl-format
 msgid "cannot stat %s"
 msgstr "b³±d stat %s"
 
-#: scripts/dpkg-source.pl:1013
+#: scripts/dpkg-source.pl:1022
 #, perl-format
 msgid "failed to create %s subdirectory"
 msgstr "nie mo¿na utworzyæ podkatalogu %s"
 
-#: scripts/dpkg-source.pl:1016
+#: scripts/dpkg-source.pl:1025
 #, perl-format
 msgid "diff patches file in directory `%s', but %s isn't a directory !"
 msgstr "diff ³ata plik w katalogu `%s', ale %s nie jest katalogiem!"
 
-#: scripts/dpkg-source.pl:1026
+#: scripts/dpkg-source.pl:1035
 #, perl-format
 msgid "failed to rename newly-extracted %s to %s"
 msgstr "nie mo¿na zmieniæ nowo wypakowanego %s na %s"
 
-#: scripts/dpkg-source.pl:1032
+#: scripts/dpkg-source.pl:1041
 #, perl-format
 msgid "failed to rename saved %s to %s"
 msgstr "nie mo¿na zmieniæ nazwy zachowanego %s na %s"
 
-#: scripts/dpkg-source.pl:1037
+#: scripts/dpkg-source.pl:1046
 #, perl-format
 msgid "%s: applying %s"
 msgstr "%s: aplikowanie %s"
 
-#: scripts/dpkg-source.pl:1042 scripts/dpkg-source.pl:1353
+#: scripts/dpkg-source.pl:1051 scripts/dpkg-source.pl:1362
 #, perl-format
 msgid "can't open diff `%s'"
 msgstr "nie mo¿na wykonaæ diff na `%s'"
 
-#: scripts/dpkg-source.pl:1045
+#: scripts/dpkg-source.pl:1054
 msgid "fork for patch"
 msgstr "fork dla patch"
 
-#: scripts/dpkg-source.pl:1047
+#: scripts/dpkg-source.pl:1056
 msgid "reopen gzip for patch"
 msgstr "ponowne otwieranie gzip dla patch"
 
-#: scripts/dpkg-source.pl:1048
+#: scripts/dpkg-source.pl:1057
 #, perl-format
 msgid "chdir to %s for patch"
 msgstr "zmiana katalogu na %s dla patch"
 
-#: scripts/dpkg-source.pl:1052
+#: scripts/dpkg-source.pl:1061
 msgid "exec patch"
 msgstr "wykonywanie patch"
 
-#: scripts/dpkg-source.pl:1055
+#: scripts/dpkg-source.pl:1064
 msgid "wait for patch"
 msgstr "czekanie na patch"
 
-#: scripts/dpkg-source.pl:1065
+#: scripts/dpkg-source.pl:1074
 #, perl-format
 msgid "cannot change timestamp for %s"
 msgstr "nie mo¿na zmieniæ znacznika czasowego dla %s"
 
-#: scripts/dpkg-source.pl:1067
+#: scripts/dpkg-source.pl:1076
 #, perl-format
 msgid "remove patch backup file %s"
 msgstr "usuwanie kopii zapasowej pliku ³aty %s"
 
-#: scripts/dpkg-source.pl:1072
+#: scripts/dpkg-source.pl:1081
 #, perl-format
 msgid "%s does not exist"
 msgstr "%s nie istnieje"
 
-#: scripts/dpkg-source.pl:1075
+#: scripts/dpkg-source.pl:1084
 #, perl-format
 msgid "cannot make %s executable"
 msgstr "nie mo¿na utworzyæ %s plikiem wykonywalnym"
 
-#: scripts/dpkg-source.pl:1077
+#: scripts/dpkg-source.pl:1086
 #, perl-format
 msgid "%s is not a plain file"
 msgstr " %s nie jest zwyk³ym plikiem"
 
-#: scripts/dpkg-source.pl:1081
+#: scripts/dpkg-source.pl:1090
 msgid "cannot stat `.'"
 msgstr "nie mo¿na stat `.'"
 
-#: scripts/dpkg-source.pl:1089
+#: scripts/dpkg-source.pl:1098
 #, perl-format
 msgid "cannot stat extracted object `%s'"
 msgstr "b³±d podczas stat na wypakowanym obiekcie `%s'"
 
-#: scripts/dpkg-source.pl:1100
+#: scripts/dpkg-source.pl:1109
 #, perl-format
 msgid "unknown object `%s' after extract (mode 0%o)"
 msgstr "nieznany obiekt `%s' po rozpakowaniu (prawa 0%o)"
 
-#: scripts/dpkg-source.pl:1105
+#: scripts/dpkg-source.pl:1114
 #, perl-format
 msgid "cannot change mode of `%s' to 0%o from 0%o"
 msgstr "nie mo¿na zmieniæ trybu pliku %s na 0%o z 0%o"
 
-#: scripts/dpkg-source.pl:1116
+#: scripts/dpkg-source.pl:1125
 #, perl-format
 msgid "cannot read %s"
 msgstr "nie mo¿na odczytaæ %s"
 
-#: scripts/dpkg-source.pl:1117
+#: scripts/dpkg-source.pl:1126
 #, perl-format
 msgid "cannot fstat %s"
 msgstr "b³±d podczas fstat %s"
 
-#: scripts/dpkg-source.pl:1118
+#: scripts/dpkg-source.pl:1127
 #, perl-format
 msgid "file %s has size %s instead of expected %s"
 msgstr "plik %s ma rozmiar %s zamiast oczekiwanego %s"
 
-#: scripts/dpkg-source.pl:1122
+#: scripts/dpkg-source.pl:1131
 #, perl-format
 msgid "file %s has md5sum %s instead of expected %s"
 msgstr "plik %s ma sumê md5 %s zamiast oczekiwanej %s"
 
-#: scripts/dpkg-source.pl:1124
+#: scripts/dpkg-source.pl:1133
 msgid "reopen stdin from /dev/null"
 msgstr "otwieranie stdin z /dev/null"
 
-#: scripts/dpkg-source.pl:1131
+#: scripts/dpkg-source.pl:1140
 #, perl-format
 msgid "cannot stat directory %s (before removal)"
 msgstr "b³±d podczas stat na katalogu %s (przed usuniêciem)"
 
-#: scripts/dpkg-source.pl:1137
+#: scripts/dpkg-source.pl:1146
 #, perl-format
 msgid "unable to check for removal of dir `%s'"
 msgstr "nie mo¿na sprawdziæ, czy usun±æ katalog `%s'"
 
-#: scripts/dpkg-source.pl:1139
+#: scripts/dpkg-source.pl:1148
 #, perl-format
 msgid "rm -rf failed to remove `%s'"
 msgstr "niepowodzenie rm -rf podczas usuwania `%s'"
 
-#: scripts/dpkg-source.pl:1151
+#: scripts/dpkg-source.pl:1160
 msgid "fork for cpio"
 msgstr "fork dla cpio"
 
-#: scripts/dpkg-source.pl:1155
+#: scripts/dpkg-source.pl:1164
 msgid "reopen gzip for cpio"
 msgstr "ponowne otwieranie gzip dla cpio"
 
-#: scripts/dpkg-source.pl:1157
+#: scripts/dpkg-source.pl:1166
 msgid "exec cpio"
 msgstr "uruchamianie cpio"
 
-#: scripts/dpkg-source.pl:1171
+#: scripts/dpkg-source.pl:1180
 #, perl-format
 msgid "tarfile `%s' contains object with newline in its name (%s)"
 msgstr "archiwum tar `%s' zawiera obiekt ze znakiem nowej linii w nazwie (%s)"
 
-#: scripts/dpkg-source.pl:1179
+#: scripts/dpkg-source.pl:1188
 #, perl-format
 msgid ""
 "first output from cpio -0t (from `%s') contains newline - you probably have "
@@ -2460,7 +2460,7 @@ msgstr ""
 "najprawdopodobniej masz przestarza³± wersjê cpio.  Na pewno dzia³a GNU cpio "
 "2.4.2-2."
 
-#: scripts/dpkg-source.pl:1188
+#: scripts/dpkg-source.pl:1197
 #, perl-format
 msgid ""
 "tarfile `%s' does not extract into a directory off the current directory (%s "
@@ -2469,53 +2469,53 @@ msgstr ""
 "archiwum tar `%s' nie wydobywa plików do katalogu pod bie¿±cym katalogiem (%"
 "s z %s)"
 
-#: scripts/dpkg-source.pl:1197
+#: scripts/dpkg-source.pl:1206
 #, perl-format
 msgid "tarfile `%s' contains object (%s) not in expected directory (%s)"
 msgstr "archiwum tar `%s' zawiera obiekt (%s) w nieoczekiwanym katalogu (%s)"
 
-#: scripts/dpkg-source.pl:1203 scripts/dpkg-source.pl:1303
+#: scripts/dpkg-source.pl:1212 scripts/dpkg-source.pl:1312
 #, perl-format
 msgid "tarfile `%s' contains object with /../ in its name (%s)"
 msgstr "archiwum tar `%s' zawiera obiekt z /../ w nazwie (%s)"
 
-#: scripts/dpkg-source.pl:1230
+#: scripts/dpkg-source.pl:1239
 msgid "fork for tar -t"
 msgstr "fork dla tar -t"
 
-#: scripts/dpkg-source.pl:1234
+#: scripts/dpkg-source.pl:1243
 msgid "reopen gzip for tar -t"
 msgstr "ponowne otwieranie gzip dla tar -t"
 
-#: scripts/dpkg-source.pl:1235
+#: scripts/dpkg-source.pl:1244
 msgid "exec tar -vvtf -"
 msgstr "uruchamianie tar -vvtf -"
 
-#: scripts/dpkg-source.pl:1245
+#: scripts/dpkg-source.pl:1254
 #, perl-format
 msgid "tarfile `%s' contains unknown object listed by tar as `%s'"
 msgstr ""
 "archiwum tar `%s' zawiera nieznany obiekt, wy¶wietlany przez tar jako `%s'"
 
-#: scripts/dpkg-source.pl:1252
+#: scripts/dpkg-source.pl:1261
 #, perl-format
 msgid "tarfile `%s' contains object `%s' with unknown or forbidden type `%s'"
 msgstr ""
 "archiwum tar `%s' zawiera obiekt `%s' o nieznanym lub zabronionym typie `%s'"
 
-#: scripts/dpkg-source.pl:1262
+#: scripts/dpkg-source.pl:1271
 #, perl-format
 msgid "tarfile `%s' contains incomplete entry `%s'\n"
 msgstr "archiwum tar `%s' zawiera niekompletny wpis `%s'\n"
 
-#: scripts/dpkg-source.pl:1286
+#: scripts/dpkg-source.pl:1295
 #, perl-format
 msgid "filename '%s' was truncated by cpio; unable to check full pathname"
 msgstr ""
 "nazwa pliku `%s' zosta³a obciêta przez cpio; nie mo¿na sprawdziæ pe³nej "
 "¶cie¿ki"
 
-#: scripts/dpkg-source.pl:1293
+#: scripts/dpkg-source.pl:1302
 #, perl-format
 msgid ""
 "tarfile `%s' contains unexpected object listed by tar as `%s'; expected `%s'"
@@ -2523,24 +2523,24 @@ msgstr ""
 "archiwum tar `%s' zawiera nieznany obiekt, wy¶wietlany przez tar jako `%s'; "
 "oczekiwano `%s'"
 
-#: scripts/dpkg-source.pl:1308
+#: scripts/dpkg-source.pl:1317
 #, perl-format
 msgid "tarfile `%s' contains file with name ending in .dpkg-orig"
 msgstr "archiwum tar `%s' zawiera plik, którego nazwa koñczy siê na .dpkg-orig"
 
-#: scripts/dpkg-source.pl:1313
+#: scripts/dpkg-source.pl:1322
 #, perl-format
 msgid "tarfile `%s' contains setuid, setgid or sticky object `%s'"
 msgstr ""
 "archiwum tar `%s' zawiera obiekt `%s' z ustawionym bitem setuid, setgid lub "
 "sticky"
 
-#: scripts/dpkg-source.pl:1318
+#: scripts/dpkg-source.pl:1327
 #, perl-format
 msgid "tarfile `%s' contains object `debian' that isn't a directory"
 msgstr "archiwum tar `%s' zawiera obiekt 'debian', który nie jest katalogiem"
 
-#: scripts/dpkg-source.pl:1327
+#: scripts/dpkg-source.pl:1336
 #, perl-format
 msgid ""
 "tarfile `%s' contains object `%s' but its containing directory `%s' does not "
@@ -2549,132 +2549,132 @@ msgstr ""
 "archiwum tar `%s' zawiera obiekt `%s', niepoprzedzony katalogiem `%s', w "
 "którym siê znajduje"
 
-#: scripts/dpkg-source.pl:1365 scripts/dpkg-source.pl:1410
-#: scripts/dpkg-source.pl:1421
+#: scripts/dpkg-source.pl:1374 scripts/dpkg-source.pl:1419
+#: scripts/dpkg-source.pl:1430
 #, perl-format
 msgid "diff `%s' is missing trailing newline"
 msgstr "plik ³aty `%s' nie koñczy siê znakiem nowej linii"
 
-#: scripts/dpkg-source.pl:1367
+#: scripts/dpkg-source.pl:1376
 #, perl-format
 msgid "expected ^--- in line %d of diff `%s'"
 msgstr "oczekiwano ^--- w linii %d pliku ³aty `%s'"
 
-#: scripts/dpkg-source.pl:1370
+#: scripts/dpkg-source.pl:1379
 #, perl-format
 msgid "diff `%s' patches file with no subdirectory"
 msgstr "diff `%s' ³ata plik, dla którego nie ma podkatalogu"
 
-#: scripts/dpkg-source.pl:1372
+#: scripts/dpkg-source.pl:1381
 #, perl-format
 msgid "diff `%s' patches file with name ending .dpkg-orig"
 msgstr "diff `%s' ³ata plik o nazwie koñcz±cej siê na .dpkg-orig"
 
-#: scripts/dpkg-source.pl:1377
+#: scripts/dpkg-source.pl:1386
 #, perl-format
 msgid "diff `%s' finishes in middle of ---/+++ (line %d)"
 msgstr "diff `%s'  koñczy siê w ¶rodku ---/+++ (linia %d)"
 
-#: scripts/dpkg-source.pl:1382 scripts/dpkg-source.pl:1389
+#: scripts/dpkg-source.pl:1391 scripts/dpkg-source.pl:1398
 #, perl-format
 msgid "line after --- isn't as expected in diff `%s' (line %d)"
 msgstr "linia po --- nie jest oczekiwana w pliku ³aty `%s' (linia %d)"
 
-#: scripts/dpkg-source.pl:1398
+#: scripts/dpkg-source.pl:1407
 #, perl-format
 msgid "diff `%s' patches something which is not a plain file"
 msgstr "diff `%s' ³ata co¶, co nie jest zwyk³ym plikiem"
 
-#: scripts/dpkg-source.pl:1403
+#: scripts/dpkg-source.pl:1412
 #, perl-format
 msgid "diff patches file %s twice"
 msgstr "diff dwukrotnie ³ata plik %s"
 
-#: scripts/dpkg-source.pl:1413
+#: scripts/dpkg-source.pl:1422
 #, perl-format
 msgid "Expected ^@@ in line %d of diff `%s'"
 msgstr "Oczekiwano ^@@ w linii %d pliku ³aty `%s'"
 
-#: scripts/dpkg-source.pl:1419
+#: scripts/dpkg-source.pl:1428
 #, perl-format
 msgid "unexpected end of diff `%s'"
 msgstr "niespodziewany koniec diff `%s'"
 
-#: scripts/dpkg-source.pl:1427
+#: scripts/dpkg-source.pl:1436
 #, perl-format
 msgid "expected [ +-] at start of line %d of diff `%s'"
 msgstr "oczekiwano [+-] na pocz±tku linii %d pliku diff `%s'"
 
-#: scripts/dpkg-source.pl:1432
+#: scripts/dpkg-source.pl:1441
 #, perl-format
 msgid "expected ^@@ at line %d of diff `%s'"
 msgstr "oczekiwano ^@@ w linii %d pliku ³aty `%s'"
 
-#: scripts/dpkg-source.pl:1443
+#: scripts/dpkg-source.pl:1452
 msgid "fork for tar -xkf -"
 msgstr "fork dla tar -xkf -"
 
-#: scripts/dpkg-source.pl:1445
+#: scripts/dpkg-source.pl:1454
 msgid "reopen gzip for tar -xkf -"
 msgstr "ponowne otwieranie gzip dla tar -xkf-"
 
-#: scripts/dpkg-source.pl:1448
+#: scripts/dpkg-source.pl:1457
 #, perl-format
 msgid "cannot chdir to `%s' for tar extract"
 msgstr "nie mo¿na zmieniæ katalogu na `%s' przy wydobywaniu z archiwum tar"
 
-#: scripts/dpkg-source.pl:1450
+#: scripts/dpkg-source.pl:1459
 msgid "exec tar -xkf -"
 msgstr "uruchamianie tar -xkf -"
 
-#: scripts/dpkg-source.pl:1453
+#: scripts/dpkg-source.pl:1462
 msgid "wait for tar -xkf -"
 msgstr "czekanie na tar -xkf -"
 
-#: scripts/dpkg-source.pl:1485
+#: scripts/dpkg-source.pl:1494
 #, perl-format
 msgid "Unable to open dir %s"
 msgstr "Nie mo¿na otworzyæ katalogu %s"
 
-#: scripts/dpkg-source.pl:1487
+#: scripts/dpkg-source.pl:1496
 #, perl-format
 msgid "Unable to close dir %s"
 msgstr "Nie mo¿na zamkn±æ katalogu %s"
 
-#: scripts/dpkg-source.pl:1490 scripts/dpkg-source.pl:1498
-#: scripts/dpkg-source.pl:1503
+#: scripts/dpkg-source.pl:1499 scripts/dpkg-source.pl:1507
+#: scripts/dpkg-source.pl:1512
 #, perl-format
 msgid "Unable to rename %s to %s"
 msgstr "Nie mo¿na zmieniæ nazwy %s na %s"
 
-#: scripts/dpkg-source.pl:1495
+#: scripts/dpkg-source.pl:1504
 #, perl-format
 msgid "Unable to mkdir %s"
 msgstr "Nie mo¿na mkdir %s"
 
-#: scripts/dpkg-source.pl:1511
+#: scripts/dpkg-source.pl:1520
 msgid "reopen stderr for tar to grep out blocks message"
 msgstr "ponowne otwieranie stderr dla tar aby wyszukaæ komuniaty o blokowaniu"
 
-#: scripts/dpkg-source.pl:1521
+#: scripts/dpkg-source.pl:1530
 #, perl-format
 msgid "checktype %s (%s)"
 msgstr "sprawdzanie typu %s (%s)"
 
-#: scripts/dpkg-source.pl:1529
+#: scripts/dpkg-source.pl:1538
 msgid "only one of -x or -b allowed, and only once"
 msgstr "dozwolona tylko jedna z opcji -x lub -b, i tylko raz"
 
-#: scripts/dpkg-source.pl:1534
+#: scripts/dpkg-source.pl:1543
 #, perl-format
 msgid "%s: cannot represent change to %s: %s"
 msgstr "%s: niereprezentowalne zmiany w %s: %s"
 
-#: scripts/dpkg-source.pl:1536 scripts/dpkg-source.pl:1545
+#: scripts/dpkg-source.pl:1545 scripts/dpkg-source.pl:1554
 msgid "write syserr unrep"
 msgstr "zapisywanie syserr unrep"
 
-#: scripts/dpkg-source.pl:1541
+#: scripts/dpkg-source.pl:1550
 #, perl-format
 msgid ""
 "%s: cannot represent change to %s:\n"
@@ -2685,80 +2685,80 @@ msgstr ""
 "%s: now± wersj± jest %s\n"
 "%s: star± wersj± jest %s\n"
 
-#: scripts/dpkg-source.pl:1563 scripts/dpkg-source.pl:1594
+#: scripts/dpkg-source.pl:1572 scripts/dpkg-source.pl:1603
 #, perl-format
 msgid "unknown compression type on file %s"
 msgstr "niepoprawny typ kompresji pliku %s"
 
-#: scripts/dpkg-source.pl:1570
+#: scripts/dpkg-source.pl:1579
 #, perl-format
 msgid "create file %s"
 msgstr "tworzenie pliku %s"
 
-#: scripts/dpkg-source.pl:1571
+#: scripts/dpkg-source.pl:1580
 msgid "pipe for gzip"
 msgstr "pipe dla gzip"
 
-#: scripts/dpkg-source.pl:1572
+#: scripts/dpkg-source.pl:1581
 msgid "fork for gzip"
 msgstr "fork dla gzip"
 
-#: scripts/dpkg-source.pl:1574
+#: scripts/dpkg-source.pl:1583
 msgid "reopen gzip pipe"
 msgstr "ponowne otwieranie pipe dla gzip"
 
-#: scripts/dpkg-source.pl:1576
+#: scripts/dpkg-source.pl:1585
 msgid "reopen tar"
 msgstr "ponowne otwieranie tar"
 
-#: scripts/dpkg-source.pl:1577
+#: scripts/dpkg-source.pl:1586
 msgid "exec gzip"
 msgstr "uruchamianie gzip"
 
-#: scripts/dpkg-source.pl:1597
+#: scripts/dpkg-source.pl:1606
 #, perl-format
 msgid "read file %s"
 msgstr "czytanie pliku %s"
 
-#: scripts/dpkg-source.pl:1598
+#: scripts/dpkg-source.pl:1607
 #, perl-format
 msgid "pipe for %s"
 msgstr "pipe dla %s"
 
-#: scripts/dpkg-source.pl:1599
+#: scripts/dpkg-source.pl:1608
 #, perl-format
 msgid "fork for %s"
 msgstr "fork dla %s"
 
-#: scripts/dpkg-source.pl:1601
+#: scripts/dpkg-source.pl:1610
 #, perl-format
 msgid "reopen %s pipe"
 msgstr "ponowne otwieranie pipe dla %s"
 
-#: scripts/dpkg-source.pl:1603
+#: scripts/dpkg-source.pl:1612
 msgid "reopen input file"
 msgstr "ponowne otwieranie pliku wej¶ciowego"
 
-#: scripts/dpkg-source.pl:1604
+#: scripts/dpkg-source.pl:1613
 #, perl-format
 msgid "exec %s"
 msgstr "uruchamianie %s"
 
-#: scripts/dpkg-source.pl:1611
+#: scripts/dpkg-source.pl:1620
 msgid "wait for gzip"
 msgstr "czekanie na gzip"
 
-#: scripts/dpkg-source.pl:1621
+#: scripts/dpkg-source.pl:1630
 #, perl-format
 msgid "tried to add file `%s' twice"
 msgstr "próbowano dwukrotnie dodaæ plik `%s'"
 
-#: scripts/dpkg-source.pl:1622
+#: scripts/dpkg-source.pl:1631
 #, perl-format
 msgid "could not stat output file `%s'"
 msgstr "b³±d podczas stat na pliku wyj¶ciowym `%s'"
 
-#: scripts/dpkg-source.pl:1643
+#: scripts/dpkg-source.pl:1652
 #, perl-format
 msgid "bogus character `\\%s' in `%s'"
 msgstr "nieprawid³owy znak `\\%s' w `%s'"
@@ -2918,28 +2918,28 @@ msgstr "Nie mo
 msgid "Couldn't parse dynamic symbol definition: %s"
 msgstr "Nie mo¿na przetworzyæ definicji symboli dynamicznych: %s"
 
-#: scripts/Dpkg/Shlibs/SymbolFile.pm:101
+#: scripts/Dpkg/Shlibs/SymbolFile.pm:103
 #, perl-format
 msgid "Can't open %s: %s"
 msgstr "Nie mo¿na otworzyæ %s: %s"
 
-#: scripts/Dpkg/Shlibs/SymbolFile.pm:107
+#: scripts/Dpkg/Shlibs/SymbolFile.pm:109
 #, perl-format
 msgid "Symbol information must be preceded by a header (file %s, line %s)."
 msgstr ""
 "Informacje o symbolach musz± byæ poprzedzone nag³ówkiem (plik %s, linia %s)."
 
-#: scripts/Dpkg/Shlibs/SymbolFile.pm:147
+#: scripts/Dpkg/Shlibs/SymbolFile.pm:149
 #, perl-format
 msgid "Failed to parse a line in %s: %s"
 msgstr "B³±d przetwarzania linii w %s: %s"
 
-#: scripts/Dpkg/Shlibs/SymbolFile.pm:161
+#: scripts/Dpkg/Shlibs/SymbolFile.pm:163
 #, perl-format
 msgid "Can't open %s for writing: %s"
 msgstr "Nie mo¿na otworzyæ %s do zapisu: %s"
 
-#: scripts/Dpkg/Shlibs/SymbolFile.pm:194
+#: scripts/Dpkg/Shlibs/SymbolFile.pm:196
 msgid "Can't merge symbols from objects without SONAME."
 msgstr "Nie mo¿na po³±czyæ symboli z obiektu bez SONAME."
 
diff --git a/scripts/po/sv.po b/scripts/po/sv.po
index a99254fa..7d13d830 100644
--- a/scripts/po/sv.po
+++ b/scripts/po/sv.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14.6\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-12-19 09:36+0100\n"
+"POT-Creation-Date: 2007-12-29 05:57+0100\n"
 "PO-Revision-Date: 2007-12-19 10:20+0100\n"
 "Last-Translator: Peter Karlsson <peterk@debian.org>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n!=1;"
+"Plural-Forms: nplurals=2; plural=n!=1;\n"
 
 #: scripts/822-date.pl:12
 msgid "Usage: 822-date"
@@ -111,8 +111,8 @@ msgstr "kan inte 
 msgid "fork for parse changelog"
 msgstr "grenar av för att tolka ändringslogg"
 
-#: scripts/controllib.pl:191 scripts/dpkg-genchanges.pl:305
-#: scripts/dpkg-gencontrol.pl:220 scripts/dpkg-source.pl:380
+#: scripts/controllib.pl:191 scripts/dpkg-genchanges.pl:306
+#: scripts/dpkg-gencontrol.pl:220 scripts/dpkg-source.pl:381
 msgid "parsed version of changelog"
 msgstr "tolkad version av ändringslogg"
 
@@ -184,11 +184,11 @@ msgid "syntax error in %s at line %d: %s"
 msgstr "syntaxfel i %s på rad %d: %s"
 
 #: scripts/dpkg-architecture.pl:35 scripts/dpkg-buildpackage.pl:21
-#: scripts/dpkg-distaddfile.pl:21 scripts/dpkg-genchanges.pl:82
+#: scripts/dpkg-distaddfile.pl:21 scripts/dpkg-genchanges.pl:83
 #: scripts/dpkg-gencontrol.pl:50 scripts/dpkg-gensymbols.pl:36
 #: scripts/dpkg-parsechangelog.pl:24 scripts/dpkg-scanpackages.pl:51
-#: scripts/dpkg-scansources.pl:96 scripts/dpkg-shlibdeps.pl:357
-#: scripts/dpkg-source.pl:138 scripts/changelog/debian.pl:31
+#: scripts/dpkg-scansources.pl:96 scripts/dpkg-shlibdeps.pl:359
+#: scripts/dpkg-source.pl:139 scripts/changelog/debian.pl:31
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s version %s.\n"
@@ -204,10 +204,10 @@ msgstr ""
 "Copyright © 2004-2005 Scott James Remnant <scott@netsplit.com>."
 
 #: scripts/dpkg-architecture.pl:41 scripts/dpkg-buildpackage.pl:28
-#: scripts/dpkg-distaddfile.pl:26 scripts/dpkg-genchanges.pl:88
+#: scripts/dpkg-distaddfile.pl:26 scripts/dpkg-genchanges.pl:89
 #: scripts/dpkg-gencontrol.pl:56 scripts/dpkg-gensymbols.pl:42
-#: scripts/dpkg-parsechangelog.pl:30 scripts/dpkg-shlibdeps.pl:366
-#: scripts/dpkg-source.pl:143 scripts/changelog/debian.pl:35
+#: scripts/dpkg-parsechangelog.pl:30 scripts/dpkg-shlibdeps.pl:368
+#: scripts/dpkg-source.pl:144 scripts/changelog/debian.pl:35
 msgid ""
 "\n"
 "This is free software; see the GNU General Public Licence version 2 or\n"
@@ -261,9 +261,9 @@ msgstr ""
 "  --version          visa versionsnummer.\n"
 
 #: scripts/dpkg-architecture.pl:120 scripts/dpkg-distaddfile.pl:54
-#: scripts/dpkg-genchanges.pl:177 scripts/dpkg-gencontrol.pl:129
+#: scripts/dpkg-genchanges.pl:178 scripts/dpkg-gencontrol.pl:129
 #: scripts/dpkg-gensymbols.pl:108 scripts/dpkg-shlibdeps.pl:82
-#: scripts/dpkg-source.pl:268 scripts/changelog/debian.pl:64
+#: scripts/dpkg-source.pl:269 scripts/changelog/debian.pl:64
 #, perl-format
 msgid "unknown option `%s'"
 msgstr "okänd flagga \"%s\""
@@ -556,7 +556,7 @@ msgid "%s: Build conflicts: "
 msgstr "%s: Byggkonflikter: "
 
 #: scripts/dpkg-checkbuilddeps.pl:157 scripts/dpkg-gencontrol.pl:261
-#: scripts/dpkg-gencontrol.pl:268 scripts/dpkg-source.pl:319
+#: scripts/dpkg-gencontrol.pl:268 scripts/dpkg-source.pl:320
 #, perl-format
 msgid "error occurred while parsing %s"
 msgstr "fel vid tolkning av %s"
@@ -618,7 +618,7 @@ msgstr "skriv ny post i ny fillistfil"
 msgid "close new files list file"
 msgstr "stäng ny fillistfil"
 
-#: scripts/dpkg-genchanges.pl:84
+#: scripts/dpkg-genchanges.pl:85
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson.\n"
@@ -628,7 +628,7 @@ msgstr ""
 "Copyright © 1996 Ian Jackson.\n"
 "Copyright © 2000,2001 Wichert Akkerman."
 
-#: scripts/dpkg-genchanges.pl:96
+#: scripts/dpkg-genchanges.pl:97
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...]\n"
@@ -688,169 +688,169 @@ msgstr ""
 "  -h, --help               visa detta hjälpmeddelande.\n"
 "      --version            visa versionsnummer.\n"
 
-#: scripts/dpkg-genchanges.pl:129 scripts/dpkg-genchanges.pl:132
-#: scripts/dpkg-genchanges.pl:136 scripts/dpkg-genchanges.pl:140
+#: scripts/dpkg-genchanges.pl:130 scripts/dpkg-genchanges.pl:133
+#: scripts/dpkg-genchanges.pl:137 scripts/dpkg-genchanges.pl:141
 #, perl-format
 msgid "cannot combine %s and -S"
 msgstr "kan inte kombinera %s och -S"
 
-#: scripts/dpkg-genchanges.pl:134
+#: scripts/dpkg-genchanges.pl:135
 #, perl-format
 msgid "%s: arch-specific upload - not including arch-independent packages"
 msgstr ""
 "%s: arkitekturspecifik insändning - inkluderar inte ark.-oberoende paket"
 
-#: scripts/dpkg-genchanges.pl:138
+#: scripts/dpkg-genchanges.pl:139
 #, perl-format
 msgid "%s: arch-indep upload - not including arch-specific packages"
 msgstr ""
 "%s: arkitekturobereoende insändning - inkluderar inte ark.-specifik paket"
 
-#: scripts/dpkg-genchanges.pl:185
+#: scripts/dpkg-genchanges.pl:186
 msgid "cannot read files list file"
 msgstr "kan inte läsa fillistfil"
 
-#: scripts/dpkg-genchanges.pl:189
+#: scripts/dpkg-genchanges.pl:190
 #, perl-format
 msgid "duplicate files list entry for package %s (line %d)"
 msgstr "duplicerad fillistpost för paketet %s (rad %d)"
 
-#: scripts/dpkg-genchanges.pl:197 scripts/dpkg-genchanges.pl:211
+#: scripts/dpkg-genchanges.pl:198 scripts/dpkg-genchanges.pl:212
 #, perl-format
 msgid "duplicate files list entry for file %s (line %d)"
 msgstr "duplicerad fillistpost för filen %s (rad %d)"
 
-#: scripts/dpkg-genchanges.pl:217
+#: scripts/dpkg-genchanges.pl:218
 #, perl-format
 msgid "badly formed line in files list file, line %d"
 msgstr "felformaterad rad i fillistfilen, rad %d"
 
-#: scripts/dpkg-genchanges.pl:238 scripts/dpkg-gencontrol.pl:174
-#: scripts/dpkg-source.pl:327
+#: scripts/dpkg-genchanges.pl:239 scripts/dpkg-gencontrol.pl:174
+#: scripts/dpkg-source.pl:328
 msgid "general section of control info file"
 msgstr "allmän sektion i styrinfofilen"
 
-#: scripts/dpkg-genchanges.pl:249
+#: scripts/dpkg-genchanges.pl:250
 #, perl-format
 msgid "package %s in control file but not in files list"
 msgstr "paketet %s i styrinfofilen men inte i fillistfilen"
 
-#: scripts/dpkg-genchanges.pl:292 scripts/dpkg-gencontrol.pl:205
-#: scripts/dpkg-source.pl:367
+#: scripts/dpkg-genchanges.pl:293 scripts/dpkg-gencontrol.pl:205
+#: scripts/dpkg-source.pl:368
 msgid "package's section of control info file"
 msgstr "paketets sektion av styrinfofilen"
 
-#: scripts/dpkg-genchanges.pl:316
+#: scripts/dpkg-genchanges.pl:317
 msgid "read changesdescription"
 msgstr "läs ändringsbeskrivning"
 
-#: scripts/dpkg-genchanges.pl:327
+#: scripts/dpkg-genchanges.pl:328
 #, perl-format
 msgid "package %s listed in files list but not in control info"
 msgstr "paketet %s listat i fillista men inte i styrinfo"
 
-#: scripts/dpkg-genchanges.pl:339
+#: scripts/dpkg-genchanges.pl:340
 #, perl-format
 msgid "missing Section for binary package %s; using '-'"
 msgstr "\"Section\" saknas för binärpaket %s; använder \"-\""
 
-#: scripts/dpkg-genchanges.pl:341
+#: scripts/dpkg-genchanges.pl:342
 #, perl-format
 msgid "package %s has section %s in control file but %s in files list"
 msgstr "paketet %s har sektionen %s i styrinfofilen men %s i fillistan"
 
-#: scripts/dpkg-genchanges.pl:348
+#: scripts/dpkg-genchanges.pl:349
 #, perl-format
 msgid "missing Priority for binary package %s; using '-'"
 msgstr "\"Priority\" saknas för binärpaketet %s; använder \"-\""
 
-#: scripts/dpkg-genchanges.pl:350
+#: scripts/dpkg-genchanges.pl:351
 #, perl-format
 msgid "package %s has priority %s in control file but %s in files list"
 msgstr "paketet %s har prioritet %s i styrfilen men %s i fillistan"
 
-#: scripts/dpkg-genchanges.pl:365
+#: scripts/dpkg-genchanges.pl:366
 msgid "missing Section for source files"
 msgstr "\"Section\" saknas för källfiler"
 
-#: scripts/dpkg-genchanges.pl:370
+#: scripts/dpkg-genchanges.pl:371
 msgid "missing Priority for source files"
 msgstr "\"Priority\" saknas för källfiler"
 
-#: scripts/dpkg-genchanges.pl:375
+#: scripts/dpkg-genchanges.pl:376
 #, perl-format
 msgid "cannot open .dsc file %s"
 msgstr "kan inte öppna .dsc-filen %s"
 
-#: scripts/dpkg-genchanges.pl:378 scripts/dpkg-source.pl:824
+#: scripts/dpkg-genchanges.pl:379 scripts/dpkg-source.pl:833
 #, perl-format
 msgid "source control file %s"
 msgstr "källstyrfilen %s"
 
-#: scripts/dpkg-genchanges.pl:384 scripts/dpkg-source.pl:863
+#: scripts/dpkg-genchanges.pl:385 scripts/dpkg-source.pl:872
 #, perl-format
 msgid "Files field contains bad line `%s'"
 msgstr "Files-fältet innehåller felaktig rad \"%s\""
 
-#: scripts/dpkg-genchanges.pl:396
+#: scripts/dpkg-genchanges.pl:397
 msgid "not including original source code in upload"
 msgstr "tar inte med ursprunglig källkod i denna insändning"
 
-#: scripts/dpkg-genchanges.pl:401
+#: scripts/dpkg-genchanges.pl:402
 msgid "ignoring -sd option for native Debian package"
 msgstr "ignorerar flaggan -sd för Debianspecifikt paket"
 
-#: scripts/dpkg-genchanges.pl:403
+#: scripts/dpkg-genchanges.pl:404
 msgid "including full source code in upload"
 msgstr "sänder med komplett källkod med denna insändning"
 
-#: scripts/dpkg-genchanges.pl:406
+#: scripts/dpkg-genchanges.pl:407
 msgid "binary-only upload - not including any source code"
 msgstr "endast binär insändning - tar inte med någon källkod"
 
-#: scripts/dpkg-genchanges.pl:410
+#: scripts/dpkg-genchanges.pl:411
 msgid "write original source message"
 msgstr "skriver meddelande om originalkällkod"
 
-#: scripts/dpkg-genchanges.pl:440
+#: scripts/dpkg-genchanges.pl:441
 #, perl-format
 msgid "cannot open upload file %s for reading"
 msgstr "kan inte öppna insändningsfilen %s för läsning"
 
-#: scripts/dpkg-genchanges.pl:441
+#: scripts/dpkg-genchanges.pl:442
 #, perl-format
 msgid "cannot fstat upload file %s"
 msgstr "kan inte ta status (fstat) på insändningsfilen %s"
 
-#: scripts/dpkg-genchanges.pl:443
+#: scripts/dpkg-genchanges.pl:444
 #, perl-format
 msgid "upload file %s is empty"
 msgstr "insändningsfilen %s är tom"
 
-#: scripts/dpkg-genchanges.pl:445
+#: scripts/dpkg-genchanges.pl:446
 #, perl-format
 msgid "md5sum upload file %s"
 msgstr "beräkna md5-summa för insändningsfilen %s"
 
-#: scripts/dpkg-genchanges.pl:447
+#: scripts/dpkg-genchanges.pl:448
 #, perl-format
 msgid "md5sum upload file %s gave strange output `%s'"
 msgstr ""
 "beräkning av md5-summa för insändningsfilen %s gav underlig utdata \"%s\""
 
-#: scripts/dpkg-genchanges.pl:451
+#: scripts/dpkg-genchanges.pl:452
 #, perl-format
 msgid "md5sum of source file %s (%s) is different from md5sum in %s (%s)"
 msgstr ""
 "md5-summa för källkodsfilen %s (%s) skiljer sig från md5-summan i %s (%s)"
 
-#: scripts/dpkg-genchanges.pl:466 scripts/dpkg-source.pl:396
+#: scripts/dpkg-genchanges.pl:467 scripts/dpkg-source.pl:397
 #, perl-format
 msgid "missing information for critical output field %s"
 msgstr "saknar information för kritiskt utdatafält %s"
 
-#: scripts/dpkg-genchanges.pl:471 scripts/dpkg-gencontrol.pl:278
-#: scripts/dpkg-gencontrol.pl:281 scripts/dpkg-source.pl:400
+#: scripts/dpkg-genchanges.pl:472 scripts/dpkg-gencontrol.pl:278
+#: scripts/dpkg-gencontrol.pl:281 scripts/dpkg-source.pl:401
 #, perl-format
 msgid "missing information for output field %s"
 msgstr "saknar information för utdatafält %s"
@@ -937,7 +937,7 @@ msgid ""
 "list (%s)"
 msgstr "aktuell värdarkitekturen \"%s\" finns i paketets arkitekturlista (%s)"
 
-#: scripts/dpkg-gencontrol.pl:224 scripts/dpkg-source.pl:384
+#: scripts/dpkg-gencontrol.pl:224 scripts/dpkg-source.pl:385
 #, perl-format
 msgid "value from nowhere, with key >%s< and value >%s<"
 msgstr "värde från ingenstans med nyckel \"%s\" och värde \"%s\""
@@ -1479,7 +1479,7 @@ msgstr "ok
 msgid "need at least one executable"
 msgstr "behöver minst en binär"
 
-#: scripts/dpkg-shlibdeps.pl:115
+#: scripts/dpkg-shlibdeps.pl:116
 #, perl-format
 msgid ""
 "couldn't find library %s needed by %s (its RPATH is '%s').\n"
@@ -1494,48 +1494,48 @@ msgstr ""
 "För att hjälpa dpkg-shlibdeps att hitta privata bibliotek måste du kanske "
 "sätta LD_LIBRARY_PATH."
 
-#: scripts/dpkg-shlibdeps.pl:198
+#: scripts/dpkg-shlibdeps.pl:200
 #, perl-format
 msgid "no dependency information found for %s (used by %s)."
 msgstr "hittade ingen beroendeinformation för %s (använd av %s)."
 
-#: scripts/dpkg-shlibdeps.pl:238
+#: scripts/dpkg-shlibdeps.pl:240
 #, perl-format
 msgid "symbol %s used by %s found in none of the libraries."
 msgstr "symbolen %s, som används av %s, hittades inte i något av biblioteken."
 
-#: scripts/dpkg-shlibdeps.pl:251
+#: scripts/dpkg-shlibdeps.pl:253
 #, perl-format
 msgid "%d other similar warnings have been skipped (use -v to see them all)."
 msgstr ""
 "%d andra liknande varningar har hoppats över (använd -v för att visa alla)."
 
-#: scripts/dpkg-shlibdeps.pl:271
+#: scripts/dpkg-shlibdeps.pl:273
 #, perl-format
 msgid "%s shouldn't be linked with %s (it uses none of its symbols)."
 msgstr "%s borde inte vara länkat mot %s (inga av symbolerna används)."
 
-#: scripts/dpkg-shlibdeps.pl:283
+#: scripts/dpkg-shlibdeps.pl:285
 #, perl-format
 msgid "open new substvars file `%s'"
 msgstr "öppna ny substvar-fil \"%s\""
 
-#: scripts/dpkg-shlibdeps.pl:286
+#: scripts/dpkg-shlibdeps.pl:288
 #, perl-format
 msgid "open old varlist file `%s' for reading"
 msgstr "öppna gammal varlistefil \"%s\" för läsning"
 
-#: scripts/dpkg-shlibdeps.pl:289
+#: scripts/dpkg-shlibdeps.pl:291
 #, perl-format
 msgid "copy old entry to new varlist file `%s'"
 msgstr "kopiera gammal post till ny varlistefil \"%s\""
 
-#: scripts/dpkg-shlibdeps.pl:349
+#: scripts/dpkg-shlibdeps.pl:351
 #, perl-format
 msgid "install new varlist file `%s'"
 msgstr "installerar ny varlistefil \"%s\""
 
-#: scripts/dpkg-shlibdeps.pl:359
+#: scripts/dpkg-shlibdeps.pl:361
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson.\n"
@@ -1548,7 +1548,7 @@ msgstr ""
 "Copyright © 2000 Wichert Akkerman.\n"
 "Copyright © 2006 Frank Lichtenheld.Copyright © 2007 Raphael Hertzog.\n"
 
-#: scripts/dpkg-shlibdeps.pl:374
+#: scripts/dpkg-shlibdeps.pl:376
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <executable>|-e<executable> [<option> ...]\n"
@@ -1594,28 +1594,28 @@ msgstr ""
 "Beroendefält som stöds är:\n"
 "  %s\n"
 
-#: scripts/dpkg-shlibdeps.pl:481
+#: scripts/dpkg-shlibdeps.pl:485
 #, perl-format
 msgid "Can't extract name and version from library name `%s'"
 msgstr "Kan inte extrahera namn och version från biblioteksnamnet \"%s\""
 
-#: scripts/dpkg-shlibdeps.pl:488
+#: scripts/dpkg-shlibdeps.pl:492
 #, perl-format
 msgid "unable to open shared libs info file `%s'"
 msgstr "kunde inte öppna informationsfil för delade bibliotek \"%s\""
 
-#: scripts/dpkg-shlibdeps.pl:494
+#: scripts/dpkg-shlibdeps.pl:498
 #, perl-format
 msgid "shared libs info file `%s' line %d: bad line `%s'"
 msgstr ""
 "informationsfilen för delade bibliotek \"%s\" rad %d: felaktig rad \"%s\""
 
-#: scripts/dpkg-shlibdeps.pl:535
+#: scripts/dpkg-shlibdeps.pl:539
 #, perl-format
 msgid "cannot open file %s"
 msgstr "kan inte öppna filen %s"
 
-#: scripts/dpkg-shlibdeps.pl:568
+#: scripts/dpkg-shlibdeps.pl:572
 #, perl-format
 msgid ""
 "$ORIGIN is used in RPATH of %s and the corresponding directory could not be "
@@ -1626,28 +1626,28 @@ msgstr ""
 "identifieras på grund av DEBIAN-underkatalogen saknas i roten av paketets "
 "byggträd"
 
-#: scripts/dpkg-shlibdeps.pl:615
+#: scripts/dpkg-shlibdeps.pl:619
 msgid "cannot fork for dpkg --search"
 msgstr "kunde inte grena för dpkg --search"
 
-#: scripts/dpkg-shlibdeps.pl:622
+#: scripts/dpkg-shlibdeps.pl:626
 msgid "cannot exec dpkg"
 msgstr "kunde inte exekvera dpkg"
 
-#: scripts/dpkg-shlibdeps.pl:627
+#: scripts/dpkg-shlibdeps.pl:631
 msgid "diversions involved - output may be incorrect"
 msgstr "omdirigeringar finns - utdata kan vara felaktiga"
 
-#: scripts/dpkg-shlibdeps.pl:629
+#: scripts/dpkg-shlibdeps.pl:633
 msgid "write diversion info to stderr"
 msgstr "skriv omdirigeringsinformation på standard fel"
 
-#: scripts/dpkg-shlibdeps.pl:633
+#: scripts/dpkg-shlibdeps.pl:637
 #, perl-format
 msgid "unknown output from dpkg --search: '%s'"
 msgstr "okända utdata från dpkg --search: \"%s\""
 
-#: scripts/dpkg-source.pl:140
+#: scripts/dpkg-source.pl:141
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson and Klee Dienes."
@@ -1655,7 +1655,7 @@ msgstr ""
 "\n"
 "Copyright © 1996 Ian Jackson and Klee Dienes."
 
-#: scripts/dpkg-source.pl:151
+#: scripts/dpkg-source.pl:152
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -1760,68 +1760,78 @@ msgstr ""
 "  -h, --help               visa detta hjälpmeddelande.\n"
 "      --version            visa versionsnummer.\n"
 
-#: scripts/dpkg-source.pl:220
+#: scripts/dpkg-source.pl:221
 #, perl-format
 msgid "%s is not a supported compression"
 msgstr "%s är inte en komprimering som stöds"
 
-#: scripts/dpkg-source.pl:224
+#: scripts/dpkg-source.pl:225
 #, perl-format
 msgid "%s is not a compression level"
 msgstr "%s är inte en komprimeringsnivå"
 
-#: scripts/dpkg-source.pl:227
+#: scripts/dpkg-source.pl:228
 #, perl-format
 msgid "-s%s option overrides earlier -s%s option"
 msgstr "flaggan -s%s ersätter tidigare flagga -s%s"
 
-#: scripts/dpkg-source.pl:272
+#: scripts/dpkg-source.pl:273
 msgid "need -x or -b"
 msgstr "behöver -x eller -b"
 
-#: scripts/dpkg-source.pl:280
+#: scripts/dpkg-source.pl:281
 #, perl-format
 msgid "source handling style -s%s not allowed with -b"
 msgstr "källkodshanteringstyp -s%s tillåts inte med -b"
 
-#: scripts/dpkg-source.pl:283
+#: scripts/dpkg-source.pl:284
 msgid "-b needs a directory"
 msgstr "-b behöver en katalog"
 
-#: scripts/dpkg-source.pl:284
+#: scripts/dpkg-source.pl:285
 msgid "-b takes at most a directory and an orig source argument"
 msgstr "-b tar som mest en katalog och en originalkällkod som argument"
 
-#: scripts/dpkg-source.pl:287
+#: scripts/dpkg-source.pl:288
 #, perl-format
 msgid "cannot stat directory %s: %s"
 msgstr "kan inte ta status på katalogen %s: %s"
 
-#: scripts/dpkg-source.pl:288
+#: scripts/dpkg-source.pl:289
 #, perl-format
 msgid "directory argument %s is not a directory"
 msgstr "katalogargumentet %s är inte en katalog"
 
-#: scripts/dpkg-source.pl:346
+#: scripts/dpkg-source.pl:347
 #, perl-format
 msgid "`%s' is not a legal architecture string"
 msgstr "\"%s\" är inte en giltig arkitektursträng"
 
-#: scripts/dpkg-source.pl:349
+#: scripts/dpkg-source.pl:350
 #, perl-format
 msgid "architecture %s only allowed on its own (list for package %s is `%s')"
 msgstr "arkitektur %s tillåts inte ensamt (listan för paketet %s är \"%s\")"
 
-#: scripts/dpkg-source.pl:402
+#: scripts/dpkg-source.pl:403
 msgid "unable to determine source package name !"
 msgstr "kunde inte bestämma namn på källkodspaket!"
 
-#: scripts/dpkg-source.pl:423
+#: scripts/dpkg-source.pl:424
+#, perl-format
+msgid "packed orig `%s' exists but is not a plain file"
+msgstr "packad orig \"%s\" finns men är inte en vanlig fil"
+
+#: scripts/dpkg-source.pl:429
+#, perl-format
+msgid "unable to stat putative packed orig `%s'"
+msgstr "kan inte ta status på förmodad packad orig \"%s\""
+
+#: scripts/dpkg-source.pl:439
 #, perl-format
 msgid "cannot stat orig argument %s: %s"
 msgstr "kunde inte ta status på originalargument %s: %s"
 
-#: scripts/dpkg-source.pl:429
+#: scripts/dpkg-source.pl:445
 #, perl-format
 msgid ""
 "orig argument is unpacked but source handling style -s%s calls for packed (."
@@ -1830,7 +1840,7 @@ msgstr ""
 "originalargument har packats upp men källkodshanteringstypen -s%s ber om en "
 "packad (.orig.tar.<ändelse>)"
 
-#: scripts/dpkg-source.pl:436
+#: scripts/dpkg-source.pl:452
 #, perl-format
 msgid ""
 "orig argument is packed but source handling style -s%s calls for unpacked (."
@@ -1839,7 +1849,7 @@ msgstr ""
 "originalargument har packats men källkodshanteringstypen -s%s ber om en "
 "uppackad (orig/)"
 
-#: scripts/dpkg-source.pl:445
+#: scripts/dpkg-source.pl:461
 #, perl-format
 msgid ""
 "orig argument is empty (means no orig, no diff) but source handling style -s%"
@@ -1848,45 +1858,35 @@ msgstr ""
 "originalargument är tomt (betyder ingen orig, ingen diff) men "
 "källkodshanteringstypen -s%s ber om något"
 
-#: scripts/dpkg-source.pl:453
-#, perl-format
-msgid "packed orig `%s' exists but is not a plain file"
-msgstr "packad orig \"%s\" finns men är inte en vanlig fil"
-
-#: scripts/dpkg-source.pl:459
-#, perl-format
-msgid "unable to stat putative packed orig `%s'"
-msgstr "kan inte ta status på förmodad packad orig \"%s\""
-
-#: scripts/dpkg-source.pl:464
+#: scripts/dpkg-source.pl:473
 #, perl-format
 msgid "unpacked orig `%s' exists but is not a directory"
 msgstr "uppackad orig \"%s\" finns men är inte en katalog"
 
-#: scripts/dpkg-source.pl:468
+#: scripts/dpkg-source.pl:477
 #, perl-format
 msgid "unable to stat putative unpacked orig `%s'"
 msgstr "kan inte ta status på förmodad uppackad orig \"%s\""
 
-#: scripts/dpkg-source.pl:480
+#: scripts/dpkg-source.pl:489
 #, perl-format
 msgid "source directory '%s' is not <sourcepackage>-<upstreamversion> '%s'"
 msgstr ""
 "källkodskatalog \"%s\" är inte <källkodspaket>-<uppströmsversion> \"%s\""
 
-#: scripts/dpkg-source.pl:494
+#: scripts/dpkg-source.pl:503
 #, perl-format
 msgid ".orig directory name %s is not <package>-<upstreamversion> (wanted %s)"
 msgstr ".orig-katalognamnet %s är inte <paket>-<uppströmsversion> (önskade %s)"
 
-#: scripts/dpkg-source.pl:503
+#: scripts/dpkg-source.pl:512
 #, perl-format
 msgid ""
 ".orig.tar name %s is not <package>_<upstreamversion>.orig.tar (wanted %s)"
 msgstr ""
 ".orig.tar-namnet %s är inte <paket>_<uppströmsversion>.orig.tar (önskade %s)"
 
-#: scripts/dpkg-source.pl:516
+#: scripts/dpkg-source.pl:525
 #, perl-format
 msgid ""
 "tarfile `%s' already exists, not overwriting, giving up; use -sU or -sR to "
@@ -1895,62 +1895,62 @@ msgstr ""
 "tarfilen \"%s\" finns redan, skriver inte över, ger upp, använd -sU eller -"
 "sR för att överstyra"
 
-#: scripts/dpkg-source.pl:519
+#: scripts/dpkg-source.pl:528
 #, perl-format
 msgid "unable to check for existence of `%s'"
 msgstr "kunde inte se om \"%s\" existerar"
 
-#: scripts/dpkg-source.pl:522 scripts/dpkg-source.pl:592
-#: scripts/dpkg-source.pl:752
+#: scripts/dpkg-source.pl:531 scripts/dpkg-source.pl:601
+#: scripts/dpkg-source.pl:761
 #, perl-format
 msgid "%s: building %s in %s"
 msgstr "%s: bygger %s i %s"
 
-#: scripts/dpkg-source.pl:524
+#: scripts/dpkg-source.pl:533
 msgid "write building tar message"
 msgstr "skriver bygg-tar-meddelande"
 
-#: scripts/dpkg-source.pl:528
+#: scripts/dpkg-source.pl:537
 msgid "fork for tar"
 msgstr "grenar för tar"
 
-#: scripts/dpkg-source.pl:531
+#: scripts/dpkg-source.pl:540
 #, perl-format
 msgid "chdir to above (orig) source %s"
 msgstr "byter katalog till ovanför (orig-)källkod %s"
 
-#: scripts/dpkg-source.pl:532
+#: scripts/dpkg-source.pl:541
 msgid "reopen gzip for tar"
 msgstr "öppnar gzip igen för tar"
 
-#: scripts/dpkg-source.pl:534
+#: scripts/dpkg-source.pl:543
 msgid "exec tar"
 msgstr "exekverar tar"
 
-#: scripts/dpkg-source.pl:538
+#: scripts/dpkg-source.pl:547
 msgid "wait for tar"
 msgstr "väntar på tar"
 
-#: scripts/dpkg-source.pl:541 scripts/dpkg-source.pl:713
+#: scripts/dpkg-source.pl:550 scripts/dpkg-source.pl:722
 #, perl-format
 msgid "unable to rename `%s' (newly created) to `%s'"
 msgstr "kunde inte byta namn på \"%s\" (precis skapad) till \"%s\""
 
-#: scripts/dpkg-source.pl:544 scripts/dpkg-source.pl:716
+#: scripts/dpkg-source.pl:553 scripts/dpkg-source.pl:725
 #, perl-format
 msgid "unable to change permission of `%s'"
 msgstr "kunde inte ändra beroenden på \"%s\""
 
-#: scripts/dpkg-source.pl:548
+#: scripts/dpkg-source.pl:557
 #, perl-format
 msgid "%s: building %s using existing %s"
 msgstr "%s: bygger %s med befintlig %s"
 
-#: scripts/dpkg-source.pl:550
+#: scripts/dpkg-source.pl:559
 msgid "write using existing tar message"
 msgstr "skriver med existerande tar-meddelande"
 
-#: scripts/dpkg-source.pl:560
+#: scripts/dpkg-source.pl:569
 #, perl-format
 msgid ""
 "orig dir `%s' already exists, not overwriting, giving up; use -sA, -sK or -"
@@ -1959,492 +1959,492 @@ msgstr ""
 "originalkatalog \"%s\" finns redan, skriver inte över, ger upp; använd -sA, -"
 "sK eller -sP för att överstyra"
 
-#: scripts/dpkg-source.pl:567
+#: scripts/dpkg-source.pl:576
 #, perl-format
 msgid "unable to check for existence of orig dir `%s'"
 msgstr "kan inte se om existerande originalkatalog \"%s\" finns"
 
-#: scripts/dpkg-source.pl:577 scripts/dpkg-source.pl:938
+#: scripts/dpkg-source.pl:586 scripts/dpkg-source.pl:947
 #, perl-format
 msgid "unable to create `%s'"
 msgstr "kan inte skapa \"%s\""
 
-#: scripts/dpkg-source.pl:581 scripts/dpkg-source.pl:919
-#: scripts/dpkg-source.pl:942
+#: scripts/dpkg-source.pl:590 scripts/dpkg-source.pl:928
+#: scripts/dpkg-source.pl:951
 #, perl-format
 msgid "unable to rename `%s' to `%s'"
 msgstr "kan inte byta namn på \"%s\" till \"%s\""
 
-#: scripts/dpkg-source.pl:585 scripts/dpkg-source.pl:944
+#: scripts/dpkg-source.pl:594 scripts/dpkg-source.pl:953
 #, perl-format
 msgid "unable to remove `%s'"
 msgstr "kan inte ta bort \"%s\""
 
-#: scripts/dpkg-source.pl:594
+#: scripts/dpkg-source.pl:603
 msgid "write building diff message"
 msgstr "skriver byggdiffmeddelande"
 
-#: scripts/dpkg-source.pl:599
+#: scripts/dpkg-source.pl:608
 msgid "fork for find"
 msgstr "grenar för find"
 
-#: scripts/dpkg-source.pl:601
+#: scripts/dpkg-source.pl:610
 #, perl-format
 msgid "chdir to %s for find"
 msgstr "byter katalog till %s för find"
 
-#: scripts/dpkg-source.pl:602
+#: scripts/dpkg-source.pl:611
 msgid "exec find"
 msgstr "exekverar find"
 
-#: scripts/dpkg-source.pl:611
+#: scripts/dpkg-source.pl:620
 #, perl-format
 msgid "cannot stat file %s"
 msgstr "kan inte ta status på filen %s"
 
-#: scripts/dpkg-source.pl:618
+#: scripts/dpkg-source.pl:627
 #, perl-format
 msgid "cannot read link %s"
 msgstr "kan inte läsa länken %s"
 
-#: scripts/dpkg-source.pl:620
+#: scripts/dpkg-source.pl:629
 #, perl-format
 msgid "cannot read orig link %s"
 msgstr "kan inte läsa originallänken %s"
 
-#: scripts/dpkg-source.pl:621 scripts/dpkg-source.pl:622
+#: scripts/dpkg-source.pl:630 scripts/dpkg-source.pl:631
 #, perl-format
 msgid "symlink to %s"
 msgstr "symbolisk länk till %s"
 
-#: scripts/dpkg-source.pl:629 scripts/dpkg-source.pl:700
+#: scripts/dpkg-source.pl:638 scripts/dpkg-source.pl:709
 #, perl-format
 msgid "cannot stat orig file %s"
 msgstr "kan inte ta status på originalfilen %s"
 
-#: scripts/dpkg-source.pl:632
+#: scripts/dpkg-source.pl:641
 #, perl-format
 msgid "newly created empty file '%s' will not be represented in diff"
 msgstr ""
 "den tomma katalogen \"%s\" som just skapats kommer inte representeras i "
 "diffen"
 
-#: scripts/dpkg-source.pl:636
+#: scripts/dpkg-source.pl:645
 #, perl-format
 msgid "executable mode %04o of '%s' will not be represented in diff"
 msgstr "exekveringsläge %04o på \"%s\" kommer inte representeras i diffen"
 
-#: scripts/dpkg-source.pl:641
+#: scripts/dpkg-source.pl:650
 #, perl-format
 msgid "special mode %04o of '%s' will not be represented in diff"
 msgstr "specialläge %04o på \"%s\" kommer inte representeras i diffen"
 
-#: scripts/dpkg-source.pl:648 scripts/dpkg-source.pl:1523
+#: scripts/dpkg-source.pl:657 scripts/dpkg-source.pl:1532
 msgid "something else"
 msgstr "något annat"
 
-#: scripts/dpkg-source.pl:649
+#: scripts/dpkg-source.pl:658
 msgid "plain file"
 msgstr "vanlig fil"
 
-#: scripts/dpkg-source.pl:652
+#: scripts/dpkg-source.pl:661
 msgid "fork for diff"
 msgstr "grenar för diff"
 
-#: scripts/dpkg-source.pl:661
+#: scripts/dpkg-source.pl:670
 msgid "exec diff"
 msgstr "exekverar diff"
 
-#: scripts/dpkg-source.pl:668
+#: scripts/dpkg-source.pl:677
 msgid "binary file contents changed"
 msgstr "innehåll i binär fil ändrat"
 
-#: scripts/dpkg-source.pl:673
+#: scripts/dpkg-source.pl:682
 #, perl-format
 msgid "file %s has no final newline (either original or modified version)"
 msgstr ""
 "filen %s har inget avslutande nyradstecken (antingen i ursprunglig eller "
 "modifierad version)"
 
-#: scripts/dpkg-source.pl:677
+#: scripts/dpkg-source.pl:686
 #, perl-format
 msgid "unknown line from diff -u on %s: `%s'"
 msgstr "okänd rad från diff -u på %s: \"%s\""
 
-#: scripts/dpkg-source.pl:680
+#: scripts/dpkg-source.pl:689
 msgid "failed to write to compression pipe"
 msgstr "misslyckades att skriva till komprimeringsrör"
 
-#: scripts/dpkg-source.pl:686
+#: scripts/dpkg-source.pl:695
 msgid "diff gave 1 but no diff lines found"
 msgstr "diff gav 1 men inga diff-rader hittades"
 
-#: scripts/dpkg-source.pl:689
+#: scripts/dpkg-source.pl:698
 #, perl-format
 msgid "diff on %s"
 msgstr "diff på %s"
 
-#: scripts/dpkg-source.pl:695
+#: scripts/dpkg-source.pl:704
 msgid "device or socket is not allowed"
 msgstr "enhet eller uttag inte tillåtet"
 
-#: scripts/dpkg-source.pl:702
+#: scripts/dpkg-source.pl:711
 msgid "not a directory"
 msgstr "ej katalog"
 
-#: scripts/dpkg-source.pl:703
+#: scripts/dpkg-source.pl:712
 msgid "directory"
 msgstr "katalog"
 
-#: scripts/dpkg-source.pl:706
+#: scripts/dpkg-source.pl:715
 #, perl-format
 msgid "unknown file type (%s)"
 msgstr "okänd filtyp (%s)"
 
-#: scripts/dpkg-source.pl:710
+#: scripts/dpkg-source.pl:719
 msgid "finish write to compression pipe"
 msgstr "avslutar skrivning till komprimeringsrör"
 
-#: scripts/dpkg-source.pl:718
+#: scripts/dpkg-source.pl:727
 msgid "fork for 2nd find"
 msgstr "grenar för andra find"
 
-#: scripts/dpkg-source.pl:720
+#: scripts/dpkg-source.pl:729
 #, perl-format
 msgid "chdir to %s for 2nd find"
 msgstr "chdir till %s för andra find"
 
-#: scripts/dpkg-source.pl:721
+#: scripts/dpkg-source.pl:730
 msgid "exec 2nd find"
 msgstr "exekverar andra find"
 
-#: scripts/dpkg-source.pl:730
+#: scripts/dpkg-source.pl:739
 #, perl-format
 msgid "cannot check orig file %s"
 msgstr "kan inte kontrollera originalfilen %s"
 
-#: scripts/dpkg-source.pl:732
+#: scripts/dpkg-source.pl:741
 #, perl-format
 msgid "ignoring deletion of file %s"
 msgstr "ignorerar borttagning av filen %s"
 
-#: scripts/dpkg-source.pl:734
+#: scripts/dpkg-source.pl:743
 #, perl-format
 msgid "ignoring deletion of directory %s"
 msgstr "ignorerar borttagning av katalogen %s"
 
-#: scripts/dpkg-source.pl:736
+#: scripts/dpkg-source.pl:745
 #, perl-format
 msgid "ignoring deletion of symlink %s"
 msgstr "ignorerar borttagning av symboliska länken %s"
 
-#: scripts/dpkg-source.pl:738
+#: scripts/dpkg-source.pl:747
 msgid "not a file, directory or link"
 msgstr "ej fil, katalog eller länk"
 
-#: scripts/dpkg-source.pl:739 scripts/dpkg-source.pl:1518
+#: scripts/dpkg-source.pl:748 scripts/dpkg-source.pl:1527
 msgid "nonexistent"
 msgstr "saknas"
 
-#: scripts/dpkg-source.pl:754
+#: scripts/dpkg-source.pl:763
 msgid "write building message"
 msgstr "skriver byggmeddelande"
 
-#: scripts/dpkg-source.pl:756
+#: scripts/dpkg-source.pl:765
 #, perl-format
 msgid "create %s"
 msgstr "skapar %s"
 
-#: scripts/dpkg-source.pl:762
+#: scripts/dpkg-source.pl:771
 #, perl-format
 msgid "%s: unrepresentable changes to source"
 msgstr "%s: ändring i källkod kan inte representeras"
 
-#: scripts/dpkg-source.pl:763
+#: scripts/dpkg-source.pl:772
 #, perl-format
 msgid "write error msg: %s"
 msgstr "skriver felmeddelande: %s"
 
-#: scripts/dpkg-source.pl:772
+#: scripts/dpkg-source.pl:781
 #, perl-format
 msgid "source handling style -s%s not allowed with -x"
 msgstr "källkodshanteringstyp -s%s tillåts inte med -x"
 
-#: scripts/dpkg-source.pl:775
+#: scripts/dpkg-source.pl:784
 msgid "-x needs at least one argument, the .dsc"
 msgstr "-x behöver åtminstone ett argument, .dsc-filen"
 
-#: scripts/dpkg-source.pl:776
+#: scripts/dpkg-source.pl:785
 msgid "-x takes no more than two arguments"
 msgstr "-x tar maximalt två argument"
 
-#: scripts/dpkg-source.pl:780
+#: scripts/dpkg-source.pl:789
 msgid "-x needs the .dsc file as first argument, not a directory"
 msgstr "-x måste ha .dsc-filen som första argument, inte en katalog"
 
-#: scripts/dpkg-source.pl:788
+#: scripts/dpkg-source.pl:797
 #, perl-format
 msgid "unpack target exists: %s"
 msgstr "mål för uppackning finns redan: %s"
 
-#: scripts/dpkg-source.pl:792 scripts/dpkg-source.pl:823
+#: scripts/dpkg-source.pl:801 scripts/dpkg-source.pl:832
 #, perl-format
 msgid "cannot open .dsc file %s: %s"
 msgstr "kan inte öppna .dsc-filen %s: %s"
 
-#: scripts/dpkg-source.pl:812
+#: scripts/dpkg-source.pl:821
 #, perl-format
 msgid "failed to verify signature on %s"
 msgstr "misslyckades verifiera signaturen på %s"
 
-#: scripts/dpkg-source.pl:816
+#: scripts/dpkg-source.pl:825
 #, perl-format
 msgid "could not verify signature on %s since gpg isn't installed"
 msgstr "kunde inte verifiera signaturen på %s eftersom gpg inte installerats"
 
-#: scripts/dpkg-source.pl:820
+#: scripts/dpkg-source.pl:829
 #, perl-format
 msgid "extracting unsigned source package (%s)"
 msgstr "extraherar osignerat källkodspaket (%s)"
 
-#: scripts/dpkg-source.pl:829
+#: scripts/dpkg-source.pl:838
 #, perl-format
 msgid "missing critical source control field %s"
 msgstr "saknar kritiska källkodsstyrfältet %s"
 
-#: scripts/dpkg-source.pl:835
+#: scripts/dpkg-source.pl:844
 #, perl-format
 msgid "Unsupported format of .dsc file (%s)"
 msgstr "Formatet på .dsc-filen stöds inte (%s)"
 
-#: scripts/dpkg-source.pl:867
+#: scripts/dpkg-source.pl:876
 #, perl-format
 msgid "Files field contains invalid filename `%s'"
 msgstr "Files-fältet innehåller ogiltigt filnamn \"%s\""
 
-#: scripts/dpkg-source.pl:872
+#: scripts/dpkg-source.pl:881
 #, perl-format
 msgid "repeated file type - files `%s' and `%s'"
 msgstr "repeterad filtyp - filerna \"%s\" och \"%s\""
 
-#: scripts/dpkg-source.pl:886
+#: scripts/dpkg-source.pl:895
 #, perl-format
 msgid "unrecognised file type - `%s'"
 msgstr "okänd filtyp - \"%s\""
 
-#: scripts/dpkg-source.pl:890
+#: scripts/dpkg-source.pl:899
 msgid "no tarfile in Files field"
 msgstr "ej tarfil i Files-fältet"
 
-#: scripts/dpkg-source.pl:893
+#: scripts/dpkg-source.pl:902
 msgid "multiple tarfiles in native package"
 msgstr "flera tarfiler i Debianspecifikt paket"
 
-#: scripts/dpkg-source.pl:894
+#: scripts/dpkg-source.pl:903
 msgid "native package with .orig.tar"
 msgstr "Debianspecifikt paket med .orig.tar"
 
-#: scripts/dpkg-source.pl:897
+#: scripts/dpkg-source.pl:906
 msgid "no upstream tarfile in Files field"
 msgstr "uppströmstarfil saknas i Files-fältet"
 
-#: scripts/dpkg-source.pl:900
+#: scripts/dpkg-source.pl:909
 #, perl-format
 msgid "multiple upstream tarballs in %s format dsc"
 msgstr "flera uppströms-tarbollar i dsc på %s-format"
 
-#: scripts/dpkg-source.pl:902
+#: scripts/dpkg-source.pl:911
 #, perl-format
 msgid "debian.tar in %s format dsc"
 msgstr "debian.tar i dsc på %s-format"
 
-#: scripts/dpkg-source.pl:912
+#: scripts/dpkg-source.pl:921
 #, perl-format
 msgid "%s: extracting %s in %s"
 msgstr "%s: extraherar %s i %s"
 
-#: scripts/dpkg-source.pl:914
+#: scripts/dpkg-source.pl:923
 msgid "write extracting message"
 msgstr "skriver extraheringsmeddelande"
 
-#: scripts/dpkg-source.pl:939
+#: scripts/dpkg-source.pl:948
 #, perl-format
 msgid "%s: unpacking %s"
 msgstr "%s: packar upp %s"
 
-#: scripts/dpkg-source.pl:952
+#: scripts/dpkg-source.pl:961
 #, perl-format
 msgid "failed to stat `%s' to see if need to copy"
 msgstr "kunde inte ta status på \"%s\" för att se om det måste kopieras"
 
-#: scripts/dpkg-source.pl:964
+#: scripts/dpkg-source.pl:973
 #, perl-format
 msgid "failed to check destination `%s' to see if need to copy"
 msgstr ""
 "misslyckades kontrollera destinationen \"%s\" för att se om det behöver "
 "kopieras"
 
-#: scripts/dpkg-source.pl:977
+#: scripts/dpkg-source.pl:986
 msgid "unable to keep orig directory (already exists)"
 msgstr "kan inte behålla originalkatalog (finns redan)"
 
-#: scripts/dpkg-source.pl:1011 scripts/dpkg-source.pl:1071
+#: scripts/dpkg-source.pl:1020 scripts/dpkg-source.pl:1080
 #, perl-format
 msgid "cannot stat %s"
 msgstr "kan inte ta status på %s"
 
-#: scripts/dpkg-source.pl:1013
+#: scripts/dpkg-source.pl:1022
 #, perl-format
 msgid "failed to create %s subdirectory"
 msgstr "misslyckades att skapa underkatalogen %s"
 
-#: scripts/dpkg-source.pl:1016
+#: scripts/dpkg-source.pl:1025
 #, perl-format
 msgid "diff patches file in directory `%s', but %s isn't a directory !"
 msgstr "diff-patchfil i katalogen \"%s\", men %s är inte en katalog!"
 
-#: scripts/dpkg-source.pl:1026
+#: scripts/dpkg-source.pl:1035
 #, perl-format
 msgid "failed to rename newly-extracted %s to %s"
 msgstr "misslyckades att ta bort %s, som just extraherats, till %s"
 
-#: scripts/dpkg-source.pl:1032
+#: scripts/dpkg-source.pl:1041
 #, perl-format
 msgid "failed to rename saved %s to %s"
 msgstr "misslyckades att byta namn på sparad %s till %s"
 
-#: scripts/dpkg-source.pl:1037
+#: scripts/dpkg-source.pl:1046
 #, perl-format
 msgid "%s: applying %s"
 msgstr "%s: tillämpar %s"
 
-#: scripts/dpkg-source.pl:1042 scripts/dpkg-source.pl:1353
+#: scripts/dpkg-source.pl:1051 scripts/dpkg-source.pl:1362
 #, perl-format
 msgid "can't open diff `%s'"
 msgstr "kan inte öppna diff \"%s\""
 
-#: scripts/dpkg-source.pl:1045
+#: scripts/dpkg-source.pl:1054
 msgid "fork for patch"
 msgstr "grenar för patch"
 
-#: scripts/dpkg-source.pl:1047
+#: scripts/dpkg-source.pl:1056
 msgid "reopen gzip for patch"
 msgstr "öppnar gzip på nytt för patch"
 
-#: scripts/dpkg-source.pl:1048
+#: scripts/dpkg-source.pl:1057
 #, perl-format
 msgid "chdir to %s for patch"
 msgstr "chdir till %s för patch"
 
-#: scripts/dpkg-source.pl:1052
+#: scripts/dpkg-source.pl:1061
 msgid "exec patch"
 msgstr "exekverar patch"
 
-#: scripts/dpkg-source.pl:1055
+#: scripts/dpkg-source.pl:1064
 msgid "wait for patch"
 msgstr "väntar på patch"
 
-#: scripts/dpkg-source.pl:1065
+#: scripts/dpkg-source.pl:1074
 #, perl-format
 msgid "cannot change timestamp for %s"
 msgstr "kan inte ändra tidsstämpel på %s"
 
-#: scripts/dpkg-source.pl:1067
+#: scripts/dpkg-source.pl:1076
 #, perl-format
 msgid "remove patch backup file %s"
 msgstr "tar bort patchsäkerhetskopian %s"
 
-#: scripts/dpkg-source.pl:1072
+#: scripts/dpkg-source.pl:1081
 #, perl-format
 msgid "%s does not exist"
 msgstr "%s finns inte"
 
-#: scripts/dpkg-source.pl:1075
+#: scripts/dpkg-source.pl:1084
 #, perl-format
 msgid "cannot make %s executable"
 msgstr "kan inte göra %s exekverbar"
 
-#: scripts/dpkg-source.pl:1077
+#: scripts/dpkg-source.pl:1086
 #, perl-format
 msgid "%s is not a plain file"
 msgstr "%s är inte en vanlig fil"
 
-#: scripts/dpkg-source.pl:1081
+#: scripts/dpkg-source.pl:1090
 msgid "cannot stat `.'"
 msgstr "kan inte ta status på \".\""
 
-#: scripts/dpkg-source.pl:1089
+#: scripts/dpkg-source.pl:1098
 #, perl-format
 msgid "cannot stat extracted object `%s'"
 msgstr "kan inte ta status på extraherat objekt \"%s\""
 
-#: scripts/dpkg-source.pl:1100
+#: scripts/dpkg-source.pl:1109
 #, perl-format
 msgid "unknown object `%s' after extract (mode 0%o)"
 msgstr "okänt objekt \"%s\" efter extrahering (läge 0%o)"
 
-#: scripts/dpkg-source.pl:1105
+#: scripts/dpkg-source.pl:1114
 #, perl-format
 msgid "cannot change mode of `%s' to 0%o from 0%o"
 msgstr "kan inte byta läge på \"%s\" till 0%o från 0%o"
 
-#: scripts/dpkg-source.pl:1116
+#: scripts/dpkg-source.pl:1125
 #, perl-format
 msgid "cannot read %s"
 msgstr "kan inte läsa %s"
 
-#: scripts/dpkg-source.pl:1117
+#: scripts/dpkg-source.pl:1126
 #, perl-format
 msgid "cannot fstat %s"
 msgstr "kan inte ta status (fstat) på %s"
 
-#: scripts/dpkg-source.pl:1118
+#: scripts/dpkg-source.pl:1127
 #, perl-format
 msgid "file %s has size %s instead of expected %s"
 msgstr "filen %s har storleken %s istället för förväntad %s"
 
-#: scripts/dpkg-source.pl:1122
+#: scripts/dpkg-source.pl:1131
 #, perl-format
 msgid "file %s has md5sum %s instead of expected %s"
 msgstr "filen %s har md5summa %s istället för förväntad %s"
 
-#: scripts/dpkg-source.pl:1124
+#: scripts/dpkg-source.pl:1133
 msgid "reopen stdin from /dev/null"
 msgstr "öppnar standard in på nytt från /dev/null"
 
-#: scripts/dpkg-source.pl:1131
+#: scripts/dpkg-source.pl:1140
 #, perl-format
 msgid "cannot stat directory %s (before removal)"
 msgstr "kan inte ta status på katalogen %s (före borttagning)"
 
-#: scripts/dpkg-source.pl:1137
+#: scripts/dpkg-source.pl:1146
 #, perl-format
 msgid "unable to check for removal of dir `%s'"
 msgstr "kan inte kontrollera för borttagning av katalogen \"%s\""
 
-#: scripts/dpkg-source.pl:1139
+#: scripts/dpkg-source.pl:1148
 #, perl-format
 msgid "rm -rf failed to remove `%s'"
 msgstr "rm -rf misslyckades att ta bort \"%s\""
 
-#: scripts/dpkg-source.pl:1151
+#: scripts/dpkg-source.pl:1160
 msgid "fork for cpio"
 msgstr "grenar för cpio"
 
-#: scripts/dpkg-source.pl:1155
+#: scripts/dpkg-source.pl:1164
 msgid "reopen gzip for cpio"
 msgstr "öppnar gzip på nytt för cpio"
 
-#: scripts/dpkg-source.pl:1157
+#: scripts/dpkg-source.pl:1166
 msgid "exec cpio"
 msgstr "exekverar cpio"
 
-#: scripts/dpkg-source.pl:1171
+#: scripts/dpkg-source.pl:1180
 #, perl-format
 msgid "tarfile `%s' contains object with newline in its name (%s)"
 msgstr "tarfilen \"%s\" innehåller objekt med nyrad i sitt namn (%s)"
 
-#: scripts/dpkg-source.pl:1179
+#: scripts/dpkg-source.pl:1188
 #, perl-format
 msgid ""
 "first output from cpio -0t (from `%s') contains newline - you probably have "
@@ -2453,7 +2453,7 @@ msgstr ""
 "första utdata från cpio -0t (från \"%s\") innehåller nyrad - du har "
 "antagligen en för gammal version av cpio. GNU cpio 2.4.2-2 vet vi fungerar"
 
-#: scripts/dpkg-source.pl:1188
+#: scripts/dpkg-source.pl:1197
 #, perl-format
 msgid ""
 "tarfile `%s' does not extract into a directory off the current directory (%s "
@@ -2462,52 +2462,52 @@ msgstr ""
 "tarfilen \"%s\" extraherar inte till en katalog som kommer från den aktuella "
 "katalogen (%s från %s)"
 
-#: scripts/dpkg-source.pl:1197
+#: scripts/dpkg-source.pl:1206
 #, perl-format
 msgid "tarfile `%s' contains object (%s) not in expected directory (%s)"
 msgstr "tarfilen \"%s\" innehåller objekt (%s) i en oväntad katalog (%s)"
 
-#: scripts/dpkg-source.pl:1203 scripts/dpkg-source.pl:1303
+#: scripts/dpkg-source.pl:1212 scripts/dpkg-source.pl:1312
 #, perl-format
 msgid "tarfile `%s' contains object with /../ in its name (%s)"
 msgstr "tarfilen \"%s\" innehåller objekt med /../ i namnet (%s)"
 
-#: scripts/dpkg-source.pl:1230
+#: scripts/dpkg-source.pl:1239
 msgid "fork for tar -t"
 msgstr "grenar för tar -t"
 
-#: scripts/dpkg-source.pl:1234
+#: scripts/dpkg-source.pl:1243
 msgid "reopen gzip for tar -t"
 msgstr "öppnar gzip på nytt för tar -t"
 
-#: scripts/dpkg-source.pl:1235
+#: scripts/dpkg-source.pl:1244
 msgid "exec tar -vvtf -"
 msgstr "exekverar tar -vvtf -"
 
-#: scripts/dpkg-source.pl:1245
+#: scripts/dpkg-source.pl:1254
 #, perl-format
 msgid "tarfile `%s' contains unknown object listed by tar as `%s'"
 msgstr "tarfilen \"%s\" innehåller okänt objekt som tar visar som \"%s\""
 
-#: scripts/dpkg-source.pl:1252
+#: scripts/dpkg-source.pl:1261
 #, perl-format
 msgid "tarfile `%s' contains object `%s' with unknown or forbidden type `%s'"
 msgstr ""
 "tarfilen \"%s\" innehåller objektet \"%s\" med okänd eller förbjuden typ \"%s"
 "\""
 
-#: scripts/dpkg-source.pl:1262
+#: scripts/dpkg-source.pl:1271
 #, perl-format
 msgid "tarfile `%s' contains incomplete entry `%s'\n"
 msgstr "tarfilen \"%s\" innehåller ofullständig post \"%s\"\n"
 
-#: scripts/dpkg-source.pl:1286
+#: scripts/dpkg-source.pl:1295
 #, perl-format
 msgid "filename '%s' was truncated by cpio; unable to check full pathname"
 msgstr ""
 "filnamnet \"%s\" trunkerades av cpio; kan inte kontrollera komplett sökväg"
 
-#: scripts/dpkg-source.pl:1293
+#: scripts/dpkg-source.pl:1302
 #, perl-format
 msgid ""
 "tarfile `%s' contains unexpected object listed by tar as `%s'; expected `%s'"
@@ -2515,23 +2515,23 @@ msgstr ""
 "tarfilen \"%s\" innehåller oväntat objekt som tar visar som \"%s\"; "
 "förväntade \"%s\""
 
-#: scripts/dpkg-source.pl:1308
+#: scripts/dpkg-source.pl:1317
 #, perl-format
 msgid "tarfile `%s' contains file with name ending in .dpkg-orig"
 msgstr "tarfilen \"%s\" innehåller filer med namn som slutar på .dpkg-orig"
 
-#: scripts/dpkg-source.pl:1313
+#: scripts/dpkg-source.pl:1322
 #, perl-format
 msgid "tarfile `%s' contains setuid, setgid or sticky object `%s'"
 msgstr ""
 "tarfilen \"%s\" innehåller setuid-, setgid- eller klistrigt objekt \"%s\""
 
-#: scripts/dpkg-source.pl:1318
+#: scripts/dpkg-source.pl:1327
 #, perl-format
 msgid "tarfile `%s' contains object `debian' that isn't a directory"
 msgstr "tarfilen \"%s\" innehåller objektet \"debian\" som inte är en katalog"
 
-#: scripts/dpkg-source.pl:1327
+#: scripts/dpkg-source.pl:1336
 #, perl-format
 msgid ""
 "tarfile `%s' contains object `%s' but its containing directory `%s' does not "
@@ -2540,132 +2540,132 @@ msgstr ""
 "tarfilen \"%s\" innehåller objektet \"%s\", men behållarkatalogen \"%s\" "
 "föregår det inte"
 
-#: scripts/dpkg-source.pl:1365 scripts/dpkg-source.pl:1410
-#: scripts/dpkg-source.pl:1421
+#: scripts/dpkg-source.pl:1374 scripts/dpkg-source.pl:1419
+#: scripts/dpkg-source.pl:1430
 #, perl-format
 msgid "diff `%s' is missing trailing newline"
 msgstr "diffen \"%s\" saknar avslutande nyradstecken"
 
-#: scripts/dpkg-source.pl:1367
+#: scripts/dpkg-source.pl:1376
 #, perl-format
 msgid "expected ^--- in line %d of diff `%s'"
 msgstr "förväntade ^--- på rad %d i diffen \"%s\""
 
-#: scripts/dpkg-source.pl:1370
+#: scripts/dpkg-source.pl:1379
 #, perl-format
 msgid "diff `%s' patches file with no subdirectory"
 msgstr "diffen \"%s\" patchar fil utan underkatalog"
 
-#: scripts/dpkg-source.pl:1372
+#: scripts/dpkg-source.pl:1381
 #, perl-format
 msgid "diff `%s' patches file with name ending .dpkg-orig"
 msgstr "diffen \"%s\" patchar fil vars namn slutar på .dpkg-orig"
 
-#: scripts/dpkg-source.pl:1377
+#: scripts/dpkg-source.pl:1386
 #, perl-format
 msgid "diff `%s' finishes in middle of ---/+++ (line %d)"
 msgstr "diffen \"%s\" slutar mitt i en ---/+++ (rad %d)"
 
-#: scripts/dpkg-source.pl:1382 scripts/dpkg-source.pl:1389
+#: scripts/dpkg-source.pl:1391 scripts/dpkg-source.pl:1398
 #, perl-format
 msgid "line after --- isn't as expected in diff `%s' (line %d)"
 msgstr "raden efter --- är inte som förväntad i diffen \"%s\" (rad %d)"
 
-#: scripts/dpkg-source.pl:1398
+#: scripts/dpkg-source.pl:1407
 #, perl-format
 msgid "diff `%s' patches something which is not a plain file"
 msgstr "diffen \"%s\" patchar något som inte är en vanlig fil"
 
-#: scripts/dpkg-source.pl:1403
+#: scripts/dpkg-source.pl:1412
 #, perl-format
 msgid "diff patches file %s twice"
 msgstr "diffen patchar filen %s två gånger"
 
-#: scripts/dpkg-source.pl:1413
+#: scripts/dpkg-source.pl:1422
 #, perl-format
 msgid "Expected ^@@ in line %d of diff `%s'"
 msgstr "Förväntade ^@@ på rad %d i diffen \"%s\""
 
-#: scripts/dpkg-source.pl:1419
+#: scripts/dpkg-source.pl:1428
 #, perl-format
 msgid "unexpected end of diff `%s'"
 msgstr "oväntad slut på diffen \"%s\""
 
-#: scripts/dpkg-source.pl:1427
+#: scripts/dpkg-source.pl:1436
 #, perl-format
 msgid "expected [ +-] at start of line %d of diff `%s'"
 msgstr "förväntade [ + ] vid början av rad %d i diffen \"%s\""
 
-#: scripts/dpkg-source.pl:1432
+#: scripts/dpkg-source.pl:1441
 #, perl-format
 msgid "expected ^@@ at line %d of diff `%s'"
 msgstr "förväntade ^@@ på rad %d i diffen \"%s\""
 
-#: scripts/dpkg-source.pl:1443
+#: scripts/dpkg-source.pl:1452
 msgid "fork for tar -xkf -"
 msgstr "grenar för tar -xkf -"
 
-#: scripts/dpkg-source.pl:1445
+#: scripts/dpkg-source.pl:1454
 msgid "reopen gzip for tar -xkf -"
 msgstr "öppnar gzip på nytt för tar -xkf -"
 
-#: scripts/dpkg-source.pl:1448
+#: scripts/dpkg-source.pl:1457
 #, perl-format
 msgid "cannot chdir to `%s' for tar extract"
 msgstr "kan inte chdir till \"%s\" för tar-uppackning"
 
-#: scripts/dpkg-source.pl:1450
+#: scripts/dpkg-source.pl:1459
 msgid "exec tar -xkf -"
 msgstr "exekverar tar -xkf -"
 
-#: scripts/dpkg-source.pl:1453
+#: scripts/dpkg-source.pl:1462
 msgid "wait for tar -xkf -"
 msgstr "väntar på tar -xkf -"
 
-#: scripts/dpkg-source.pl:1485
+#: scripts/dpkg-source.pl:1494
 #, perl-format
 msgid "Unable to open dir %s"
 msgstr "Kan inte öppna katalogen %s"
 
-#: scripts/dpkg-source.pl:1487
+#: scripts/dpkg-source.pl:1496
 #, perl-format
 msgid "Unable to close dir %s"
 msgstr "Kan inte stänga katalogen %s"
 
-#: scripts/dpkg-source.pl:1490 scripts/dpkg-source.pl:1498
-#: scripts/dpkg-source.pl:1503
+#: scripts/dpkg-source.pl:1499 scripts/dpkg-source.pl:1507
+#: scripts/dpkg-source.pl:1512
 #, perl-format
 msgid "Unable to rename %s to %s"
 msgstr "Kan inte byta namn på %s till %s"
 
-#: scripts/dpkg-source.pl:1495
+#: scripts/dpkg-source.pl:1504
 #, perl-format
 msgid "Unable to mkdir %s"
 msgstr "Kan inte mkdir %s"
 
-#: scripts/dpkg-source.pl:1511
+#: scripts/dpkg-source.pl:1520
 msgid "reopen stderr for tar to grep out blocks message"
 msgstr "öppnar stderr på nytt för tar för att grep:a ut blockmeddelande"
 
-#: scripts/dpkg-source.pl:1521
+#: scripts/dpkg-source.pl:1530
 #, perl-format
 msgid "checktype %s (%s)"
 msgstr "kontrollerar typ %s (%s)"
 
-#: scripts/dpkg-source.pl:1529
+#: scripts/dpkg-source.pl:1538
 msgid "only one of -x or -b allowed, and only once"
 msgstr "endast en av -x och -b tillåts, och endast en gång"
 
-#: scripts/dpkg-source.pl:1534
+#: scripts/dpkg-source.pl:1543
 #, perl-format
 msgid "%s: cannot represent change to %s: %s"
 msgstr "%s: kan inte representera ändringen för %s: %s"
 
-#: scripts/dpkg-source.pl:1536 scripts/dpkg-source.pl:1545
+#: scripts/dpkg-source.pl:1545 scripts/dpkg-source.pl:1554
 msgid "write syserr unrep"
 msgstr "skriver systemfel i unrep"
 
-#: scripts/dpkg-source.pl:1541
+#: scripts/dpkg-source.pl:1550
 #, perl-format
 msgid ""
 "%s: cannot represent change to %s:\n"
@@ -2676,80 +2676,80 @@ msgstr ""
 "%s:  ny versionen är %s\n"
 "%s:  gamla versionen är %s\n"
 
-#: scripts/dpkg-source.pl:1563 scripts/dpkg-source.pl:1594
+#: scripts/dpkg-source.pl:1572 scripts/dpkg-source.pl:1603
 #, perl-format
 msgid "unknown compression type on file %s"
 msgstr "okänd komprimeringstyp på filen %s"
 
-#: scripts/dpkg-source.pl:1570
+#: scripts/dpkg-source.pl:1579
 #, perl-format
 msgid "create file %s"
 msgstr "skapar filen %s"
 
-#: scripts/dpkg-source.pl:1571
+#: scripts/dpkg-source.pl:1580
 msgid "pipe for gzip"
 msgstr "rör för gzip"
 
-#: scripts/dpkg-source.pl:1572
+#: scripts/dpkg-source.pl:1581
 msgid "fork for gzip"
 msgstr "grenar för gzip"
 
-#: scripts/dpkg-source.pl:1574
+#: scripts/dpkg-source.pl:1583
 msgid "reopen gzip pipe"
 msgstr "öppnar gzip-rör på nytt"
 
-#: scripts/dpkg-source.pl:1576
+#: scripts/dpkg-source.pl:1585
 msgid "reopen tar"
 msgstr "öppnar tar på nytt"
 
-#: scripts/dpkg-source.pl:1577
+#: scripts/dpkg-source.pl:1586
 msgid "exec gzip"
 msgstr "exekverar gzip"
 
-#: scripts/dpkg-source.pl:1597
+#: scripts/dpkg-source.pl:1606
 #, perl-format
 msgid "read file %s"
 msgstr "läser filen %s"
 
-#: scripts/dpkg-source.pl:1598
+#: scripts/dpkg-source.pl:1607
 #, perl-format
 msgid "pipe for %s"
 msgstr "rör för %s"
 
-#: scripts/dpkg-source.pl:1599
+#: scripts/dpkg-source.pl:1608
 #, perl-format
 msgid "fork for %s"
 msgstr "grenar för %s"
 
-#: scripts/dpkg-source.pl:1601
+#: scripts/dpkg-source.pl:1610
 #, perl-format
 msgid "reopen %s pipe"
 msgstr "öppnar %s-rör på nytt"
 
-#: scripts/dpkg-source.pl:1603
+#: scripts/dpkg-source.pl:1612
 msgid "reopen input file"
 msgstr "öppnar indatafilen på nytt"
 
-#: scripts/dpkg-source.pl:1604
+#: scripts/dpkg-source.pl:1613
 #, perl-format
 msgid "exec %s"
 msgstr "exekverar %s"
 
-#: scripts/dpkg-source.pl:1611
+#: scripts/dpkg-source.pl:1620
 msgid "wait for gzip"
 msgstr "väntar på gzip"
 
-#: scripts/dpkg-source.pl:1621
+#: scripts/dpkg-source.pl:1630
 #, perl-format
 msgid "tried to add file `%s' twice"
 msgstr "försökte lägga till filen \"%s\" två gånger"
 
-#: scripts/dpkg-source.pl:1622
+#: scripts/dpkg-source.pl:1631
 #, perl-format
 msgid "could not stat output file `%s'"
 msgstr "kunde inte ta status på utdatafilen \"%s\""
 
-#: scripts/dpkg-source.pl:1643
+#: scripts/dpkg-source.pl:1652
 #, perl-format
 msgid "bogus character `\\%s' in `%s'"
 msgstr "skräptecken \"\\%s\" i \"%s\""
@@ -2909,27 +2909,27 @@ msgstr "kunde inte exekvera objdump: %s"
 msgid "Couldn't parse dynamic symbol definition: %s"
 msgstr "Kunde inte tolka definition av dynamisk symbol: %s"
 
-#: scripts/Dpkg/Shlibs/SymbolFile.pm:101
+#: scripts/Dpkg/Shlibs/SymbolFile.pm:103
 #, perl-format
 msgid "Can't open %s: %s"
 msgstr "Kan inte öppna %s: %s"
 
-#: scripts/Dpkg/Shlibs/SymbolFile.pm:107
+#: scripts/Dpkg/Shlibs/SymbolFile.pm:109
 #, perl-format
 msgid "Symbol information must be preceded by a header (file %s, line %s)."
 msgstr "Symbolinformation måste föregås av ett huvud (fil %s, rad %s)."
 
-#: scripts/Dpkg/Shlibs/SymbolFile.pm:147
+#: scripts/Dpkg/Shlibs/SymbolFile.pm:149
 #, perl-format
 msgid "Failed to parse a line in %s: %s"
 msgstr "misslyckades att tolka en rad i %s: %s"
 
-#: scripts/Dpkg/Shlibs/SymbolFile.pm:161
+#: scripts/Dpkg/Shlibs/SymbolFile.pm:163
 #, perl-format
 msgid "Can't open %s for writing: %s"
 msgstr "Kunde inte öppna %s för skrivning: %s"
 
-#: scripts/Dpkg/Shlibs/SymbolFile.pm:194
+#: scripts/Dpkg/Shlibs/SymbolFile.pm:196
 msgid "Can't merge symbols from objects without SONAME."
 msgstr "Kan inte slå ihop symboler från objekt utan SONAMN."
 
@@ -2982,8 +2982,8 @@ msgstr "%s misslyckades med ok
 #~ "couldn't find library %s (note: only packages with 'shlibs' files are "
 #~ "looked into)."
 #~ msgstr ""
-#~ "hittade inte biblioteket %s (observera: ser bara på paket med \"shlibs\"-"
-#~ "filer)."
+#~ "hittade inte biblioteket %s (observera: ser bara på paket med \"shlibs"
+#~ "\"-filer)."
 
 #~ msgid "can't parse dependency %s"
 #~ msgstr "kan inte tolka beroende %s"
@@ -2998,7 +2998,8 @@ msgstr "%s misslyckades med ok
 #~ msgstr "kunde inte öppna \"%s\" för test"
 
 #~ msgid "unable to read first four bytes of '%s' as magic number"
-#~ msgstr "kunde inte läsa de första fyra byten av \"%s\" som magiskt nummer"
+#~ msgstr ""
+#~ "kunde inte läsa de första fyra byten av \"%s\" som magiskt nummer"
 
 #~ msgid "unrecognized file type for '%s'"
 #~ msgstr "okänd filtyp för \"%s\""